diff --git a/include/common.h b/include/common.h index 4a550c3..8121e2e 100644 --- a/include/common.h +++ b/include/common.h @@ -570,4 +570,7 @@ extern SomethingMusic __MAYBE_SONG_800EB150; extern SomethingMusic __MAYBE_SONG_800EB240; extern SomethingMusic __MAYBE_SONG_800EB290; +extern char *obStrategyName[]; +extern char *obGetStrategyName(u8 index); + #endif \ No newline at end of file diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 9db53a7..c7c2030 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -241,6 +241,8 @@ STR_CANNOT_BE_USED = 0x8021DF80; // rom:0x1B2290 STR_PETRIFICATION = 0x8021DFA0; // rom:0x1B22B0 obStrategyName = 0x80186FC4; // rom:0x5CEC4 size:16 +obGetStrategyName = 0x8016B070; // rom:0x40F70 + //obStrategyNameAutonomous = 0x80186F70; // rom:0x5CE70 type:asciz //obStrategyNameAttackStrongest = 0x80186F80; // rom:0x5CE80 type:asciz //obStrategyNameAttackLeader = 0x80186F94; // rom:0x5CE94 type:asciz diff --git a/src/data/strategy.c b/src/data/strategy.c index 5f66138..fe111bf 100644 --- a/src/data/strategy.c +++ b/src/data/strategy.c @@ -19,7 +19,7 @@ char obStrategyNameAttackWeakest[] = DECORATE("Attack" NEWLINE INDENT "Weakest") u8 D_80186FBC[] = { 0x07, 0x02, 0x06, 0x03, 0x05, 0x04, 0x01, 0x00 }; /* 5CEC4 80186FC4 */ -char* obStrategyName[] = { +char *obStrategyName[] = { obStrategyNameAutonomous, obStrategyNameAttackStrongest, obStrategyNameAttackLeader, diff --git a/src/segment_obdata/_ob_blushing_ship.c b/src/segment_obdata/_ob_blushing_ship.c index 3eaec21..5bb61b1 100644 --- a/src/segment_obdata/_ob_blushing_ship.c +++ b/src/segment_obdata/_ob_blushing_ship.c @@ -1,14 +1,15 @@ #include "common.h" -void func_8016AF80(void) { -} +void func_8016AF80(void) { } -void func_8016AF88(void) { -} +void func_8016AF88(void) { } INCLUDE_ASM(const s32, "segment_obdata/_ob_blushing_ship", func_8016AF90); -INCLUDE_ASM(const s32, "segment_obdata/_ob_blushing_ship", func_8016B070); +/* 40F70 8016B070 */ +char *obGetStrategyName(u8 index) { + return obStrategyName[index]; +} INCLUDE_ASM(const s32, "segment_obdata/_ob_blushing_ship", func_8016B088);