Changes from hard mode (#18)

* added linkers for mario_pouch variables

* most of the merging complete

* change iValue name

* add script changes

* add addresses

* add make_jump_table

* add address

* fix subrepo

* fix evt_npc

* fixed spm headers

* fix the build error

* fix second build error

* fix third build error, if this causes more then idk what to do lol

* fix mistake

* add semicolon back

* nvm lol it still needs to be removed

* revert evt_cmd

* fix npc_dimeen_l.c position in lst

Author: L5050

include/spm/evt_npc.h

@@ -58,9 +58,9 @@ UNKNOWN_FUNCTION(func_80101f48);
 UNKNOWN_FUNCTION(func_80102424);
 EVT_UNKNOWN_USER_FUNC(evt_npc_glide_to)
 EVT_UNKNOWN_USER_FUNC(func_80102bf8)
-UNKNOWN_FUNCTION(evt_npc_get_hp);
+EVT_UNKNOWN_USER_FUNC(evt_npc_get_hp)
 UNKNOWN_FUNCTION(evt_npc_get_max_hp);
-UNKNOWN_FUNCTION(evt_npc_set_hp);
+EVT_UNKNOWN_USER_FUNC(evt_npc_set_hp)
 
 // evt_npc_delete(const char * name)
 EVT_DECLARE_USER_FUNC(evt_npc_delete, 1)

include/spm/evtmgr.h

@@ -139,6 +139,7 @@ DECOMP_STATIC(s32 evtmgr_runMainF)
 */
 EvtWork * evtGetWork();
 
+DECOMP_STATIC(void make_jump_table(EvtEntry* entry))
 /*
     Allocates memories for entries and zeros global evt variables
 */

include/spm/npc_dimeen_l.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <common.h>
+#include <spm/npcdrv.h>
+
+CPP_WRAPPER(spm::npc_dimeen_l)
+
+USING(spm::npcdrv::NPCDefense)
+
+extern NPCDefense superDimentioHeadDefenses;
+extern NPCDefense superDimentioBodyDefenses;
+
+CPP_WRAPPER_END()

linker/spm.eu0.lst

@@ -7,7 +7,6 @@
 
 /* Dol */
 
-
 // Runtime.PPCEABI.H.a
 // __mem.c
 80004000:memcpy
@@ -171,6 +170,13 @@
 800d36f4:func_800d36f4
 // more
 
+// evt_item.c
+800ecc84:evt_item_entry
+800ecda0:evt_item_get_position
+800ece50:evt_item_set_position
+800eced8:evt_item_flag_onoff
+800ed12c:evt_item_wait_collected
+
 // evt_sub.c
 800d37d8:evt_sub_intpl_msec_init
 800d3878:evt_sub_intpl_msec_get_value
@@ -184,10 +190,12 @@
 
 // evtmgr.c
 800d87e4:evtGetWork
+800d890c:make_jump_table
 800d8b88:evtEntry
 800d8df4:evtEntryType
 800d9060:evtChildEntry
 800d9370:evtBrotherEntry
+800d9944:evtDelete
 800d9b88:evtCheckID
 // more
 
@@ -299,6 +307,8 @@
 
 // evt_mobj.c
 // text
+800f39e4:evt_mobj_get_position
+800f3e34:evt_mobj_wait_animation_end
 800f3608:evt_mobj_delete
 800f380c:evt_mobj_flag_onoff
 800f5ad8:evt_mobj_zyo
@@ -320,19 +330,24 @@
 800fd0c4:evt_msg_fmt_str
 // more
 // evt_npc.c
+80102c7c:evt_npc_get_hp
+80102d3c:evt_npc_get_max_hp
+80102dfc:evt_npc_set_hp
 800fe124:evt_npc_get_position
 800fe21c:evt_npc_set_position
 800fe668:evt_npc_rotate
 800fe92c:func_800fe92c
 800ffbd8:evt_npc_walk_to
 801004c0:evt_npc_jump_to
+80102574:evt_npc_glide_to
 80102EB8:evt_npc_stats_set_up
 80102f5c:evt_npc_entry
 80103054:func_80103054
 80103108:evt_npc_set_anim
 80103410:func_80103410
 8010368c:evt_npc_flag8_onoff
 801039b8:evt_npc_animflag_onoff
+80103dbc:evt_npc_get_unitwork
 80103ea8:evt_npc_set_unitwork
 80104694:func_80104694
 80104c94:evt_npc_set_property
@@ -369,6 +384,7 @@
 8010cd88:evt_pouch_get_level
 8010ce04:evt_pouch_get_next_level_xp
 8010cffc:evt_pouch_increment_enemies_defeated
+8014f7c8:pouchGetCardCount
 
 // evt_seq.c
 8010d028:evt_seq_set_seq
@@ -400,10 +416,19 @@
 8014f080:pouchGetPixlInfo
 // text
 8014c088:pouchGetPtr
+8014d394:pouchSetAttack
+8014d3c8:pouchGetAttack
+8014d3d8:pouchAddAttack
+8014d414:pouchSetHp
 8014d458:pouchGetHp
 8014d468:pouchAddHp
+8014d4b4:pouchSetMaxHp
+8014d4e8:pouchGetMaxHp
 8014d4f8:pouchGetXp
 8014d508:pouchAddXp
+8014d548:pouchSetCoin
+8014d57c:pouchGetCoin
+8014d58c:pouchAddCoin
 8014d5f8:pouchAddItem
 8014dbf4:pouchCheckHaveItem
 8014df4c:pouchRemoveItem
@@ -607,6 +632,12 @@
 80449888:npcEnemyTemplates
 // more
 
+// npc_dimeen_l.c
+// data
+8045B9E0:superDimentioHeadDefenses
+8045B9F8:superDimentioBodyDefenses
+//more
+
 // wpadmgr.c
 80237688:wpadGetButtonsHeld
 802376b0:wpadGetButtonsPressed

linker/spm.jp0.lst

@@ -3,6 +3,7 @@
 800030c8:firstRel
 800030cc:lastRel
 
+
 // Automatically generated from spm.eu0.lst
 80004000:memcpy
 80004104:memset
@@ -633,3 +634,25 @@
 8026EB78:Run
 80542e90:SaveStart
 80542e94:SaveEnd
+
+// new to SPM-Hard-Mode
+8014C8A0:pouchSetAttack
+8014C8D4:pouchGetAttack
+8014C8E4:pouchAddAttack
+8014C920:pouchSetHp
+8014C9C0:pouchSetMaxHp
+8014C9F4:pouchGetMaxHp
+8014CA54:pouchSetCoin
+8014CA88:pouchGetCoin
+8014CA98:pouchAddCoin
+8014ECD4:pouchGetCardCount
+80101B94:evt_npc_glide_to
+801033DC:evt_npc_get_unitwork
+801034C8:evt_npc_set_unitwork
+800D8ADC:make_jump_table
+8010241C:evt_npc_set_hp
+8010229C:evt_npc_get_hp
+8010235C:evt_npc_get_max_hp
+800D9B14:evtDelete
+803F0E88:superDimentioHeadDefenses
+803F0EA0:superDimentioBodyDefenses

linker/spm.us0.lst

@@ -633,3 +633,25 @@
 8026ebc8:Run
 8056db90:SaveStart
 8056db94:SaveEnd
+
+// new to SPM-Hard-Mode
+8014C8A0:pouchSetAttack
+8014C8D4:pouchGetAttack
+8014C8E4:pouchAddAttack
+8014C920:pouchSetHp
+8014C9C0:pouchSetMaxHp
+8014C9F4:pouchGetMaxHp
+8014CA54:pouchSetCoin
+8014CA88:pouchGetCoin
+8014CA98:pouchAddCoin
+8014ECD4:pouchGetCardCount
+80101B94:evt_npc_glide_to
+801033DC:evt_npc_get_unitwork
+801034C8:evt_npc_set_unitwork
+800D8ADC:make_jump_table
+8010241C:evt_npc_set_hp
+8010229C:evt_npc_get_hp
+8010235C:evt_npc_get_max_hp
+800d9b14:evtDelete
+8041BC28:superDimentioHeadDefenses
+8041BC40:superDimentioBodyDefenses

linker/spm.us2.lst

@@ -633,3 +633,25 @@
 8026F338:Run
 8056d570:SaveStart
 8056d574:SaveEnd
+
+// new to SPM-Hard-Mode
+8014CCF8:pouchSetAttack
+8014CD2C:pouchGetAttack
+8014CD3C:pouchAddAttack
+8014CD78:pouchSetHp
+8014CE18:pouchSetMaxHp
+8014CE4C:pouchGetMaxHp
+8014CEAC:pouchSetCoin
+8014CEE0:pouchGetCoin
+8014CEF0:pouchAddCoin
+8014F12C:pouchGetCardCount
+80101FC4:evt_npc_glide_to
+8010380C:evt_npc_get_unitwork
+801038F8:evt_npc_set_unitwork
+800D8A60:make_jump_table
+8010284C:evt_npc_set_hp
+801026CC:evt_npc_get_hp
+8010278C:evt_npc_get_max_hp
+800D9A98:evtDelete
+8041D258:superDimentioHeadDefenses
+8041D270:superDimentioBodyDefenses