Changed 43100 to `class`

splat.yaml

@@ -439,7 +439,7 @@ segments:
       - [0x420D0, asm]
       - [0x42C30, c]
       - [0x42C90, asm]
-      - [0x43100, c]
+      - [0x43100, c, "class"]
       - [0x45480, c, "equipment"]
       - [0x45AE0, c]
       - [0x45CB0, asm]

src/class.c

@@ -2,65 +2,65 @@
 #include "element.h"
 #include "equipment.h"
 
-INCLUDE_ASM(const s32, "43100", func_8016D200);
+INCLUDE_ASM(const s32, "class", func_8016D200);
 
-INCLUDE_ASM(const s32, "43100", func_8016D254);
+INCLUDE_ASM(const s32, "class", func_8016D254);
 
-INCLUDE_ASM(const s32, "43100", func_8016D2A8);
+INCLUDE_ASM(const s32, "class", func_8016D2A8);
 
-INCLUDE_ASM(const s32, "43100", func_8016D2FC);
+INCLUDE_ASM(const s32, "class", func_8016D2FC);
 
-INCLUDE_ASM(const s32, "43100", func_8016D350);
+INCLUDE_ASM(const s32, "class", func_8016D350);
 
-INCLUDE_ASM(const s32, "43100", func_8016D3A4);
+INCLUDE_ASM(const s32, "class", func_8016D3A4);
 
-INCLUDE_ASM(const s32, "43100", func_8016D3F8);
+INCLUDE_ASM(const s32, "class", func_8016D3F8);
 
-INCLUDE_ASM(const s32, "43100", func_8016D44C);
+INCLUDE_ASM(const s32, "class", func_8016D44C);
 
-INCLUDE_ASM(const s32, "43100", func_8016D4A0);
+INCLUDE_ASM(const s32, "class", func_8016D4A0);
 
-INCLUDE_ASM(const s32, "43100", func_8016D4F4);
+INCLUDE_ASM(const s32, "class", func_8016D4F4);
 
-INCLUDE_ASM(const s32, "43100", func_8016D548);
+INCLUDE_ASM(const s32, "class", func_8016D548);
 
-INCLUDE_ASM(const s32, "43100", func_8016D59C);
+INCLUDE_ASM(const s32, "class", func_8016D59C);
 
-INCLUDE_ASM(const s32, "43100", func_8016D5F0);
+INCLUDE_ASM(const s32, "class", func_8016D5F0);
 
-INCLUDE_ASM(const s32, "43100", func_8016D644);
+INCLUDE_ASM(const s32, "class", func_8016D644);
 
-INCLUDE_ASM(const s32, "43100", func_8016D698);
+INCLUDE_ASM(const s32, "class", func_8016D698);
 
-INCLUDE_ASM(const s32, "43100", func_8016D6EC);
+INCLUDE_ASM(const s32, "class", func_8016D6EC);
 
-INCLUDE_ASM(const s32, "43100", func_8016D740);
+INCLUDE_ASM(const s32, "class", func_8016D740);
 
-INCLUDE_ASM(const s32, "43100", func_8016D794);
+INCLUDE_ASM(const s32, "class", func_8016D794);
 
-INCLUDE_ASM(const s32, "43100", func_8016D7E8);
+INCLUDE_ASM(const s32, "class", func_8016D7E8);
 
-INCLUDE_ASM(const s32, "43100", func_8016D83C);
+INCLUDE_ASM(const s32, "class", func_8016D83C);
 
-INCLUDE_ASM(const s32, "43100", func_8016D890);
+INCLUDE_ASM(const s32, "class", func_8016D890);
 
-INCLUDE_ASM(const s32, "43100", func_8016D8E4);
+INCLUDE_ASM(const s32, "class", func_8016D8E4);
 
-INCLUDE_ASM(const s32, "43100", func_8016D938);
+INCLUDE_ASM(const s32, "class", func_8016D938);
 
-INCLUDE_ASM(const s32, "43100", func_8016D98C);
+INCLUDE_ASM(const s32, "class", func_8016D98C);
 
-INCLUDE_ASM(const s32, "43100", func_8016D9E0);
+INCLUDE_ASM(const s32, "class", func_8016D9E0);
 
-INCLUDE_ASM(const s32, "43100", func_8016DA34);
+INCLUDE_ASM(const s32, "class", func_8016DA34);
 
-INCLUDE_ASM(const s32, "43100", func_8016DA88);
+INCLUDE_ASM(const s32, "class", func_8016DA88);
 
-INCLUDE_ASM(const s32, "43100", func_8016DADC);
+INCLUDE_ASM(const s32, "class", func_8016DADC);
 
-INCLUDE_ASM(const s32, "43100", func_8016DB30);
+INCLUDE_ASM(const s32, "class", func_8016DB30);
 
-INCLUDE_ASM(const s32, "43100", func_8016DB84);
+INCLUDE_ASM(const s32, "class", func_8016DB84);
 
 /* 43AD8 8016DBD8 */
 u8 class_get_field_0x2c(u8 portrait, u8 class) {
@@ -269,7 +269,7 @@ char* ability_get_name(u8 index) {
 }
 
 /* 44358 8016E458 */
-u8 func_8016E458(u8 index) {
+u8 ability_get_field_0x4(u8 index) {
     return ABILITY_DATA[index].field_0x4;
 }
 
@@ -293,9 +293,9 @@ Element ability_get_element(u8 index, u16 arg1, u16 arg2, s32 arg3, u16 arg4) {
 }
 
 
-INCLUDE_ASM(const s32, "43100", func_8016E50C);
+INCLUDE_ASM(const s32, "class", func_8016E50C);
 
-INCLUDE_ASM(const s32, "43100", func_8016EA34);
+INCLUDE_ASM(const s32, "class", func_8016EA34);
 
 /* 449EC 8016EAEC */
 u16 character_get_item(CharacterSlot* character, u8 slot) {
@@ -327,16 +327,16 @@ u16 character_get_item(CharacterSlot* character, u8 slot) {
 }
 
 
-INCLUDE_ASM(const s32, "43100", __character_handle_levelup);
+INCLUDE_ASM(const s32, "class", __character_handle_levelup);
 
-INCLUDE_ASM(const s32, "43100", __character_initialise);
+INCLUDE_ASM(const s32, "class", __character_initialise);
 
-INCLUDE_ASM(const s32, "43100", func_8016F4E0);
+INCLUDE_ASM(const s32, "class", func_8016F4E0);
 
-INCLUDE_ASM(const s32, "43100", func_8016F500);
+INCLUDE_ASM(const s32, "class", func_8016F500);
 
-INCLUDE_ASM(const s32, "43100", func_8016F520);
+INCLUDE_ASM(const s32, "class", func_8016F520);
 
-INCLUDE_ASM(const s32, "43100", func_8016F540);
+INCLUDE_ASM(const s32, "class", func_8016F540);
 
-INCLUDE_ASM(const s32, "43100", func_8016F560);
+INCLUDE_ASM(const s32, "class", func_8016F560);

symbol_addrs.txt

@@ -93,6 +93,7 @@ FORMATION_COMMAND_NAMES = 0x8021315C; // rom:0x1642CC type:char*
 
 ABILITY_DATA = 0x8018AA7C; // rom:0x6097C size:0x10
 ability_get_name = 0x8016E440;
+ability_get_field_0x4 = 0x8016E458; // rom:0x44358
 ability_get_element = 0x8016E470;
 
 FP_EQUIPMENT_GET_RESISTANCE = 0x801EF2B0; // rom:0xDBD10