gijs
/
ogrebattle64
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Found obGetStrategyName

This commit is contained in:
gijs 2023-09-25 23:53:11 +02:00
parent 197963c330
commit 5cf59a6169
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/common.h
View File

@ -570,4 +570,7 @@ extern SomethingMusic __MAYBE_SONG_800EB150;
extern SomethingMusic __MAYBE_SONG_800EB240; extern SomethingMusic __MAYBE_SONG_800EB240;
extern SomethingMusic __MAYBE_SONG_800EB290; extern SomethingMusic __MAYBE_SONG_800EB290;
extern char *obStrategyName[];
extern char *obGetStrategyName(u8 index);
#endif #endif

2
linker_scripts/symbols/addr.txt
View File

@ -241,6 +241,8 @@ STR_CANNOT_BE_USED = 0x8021DF80; // rom:0x1B2290
STR_PETRIFICATION = 0x8021DFA0; // rom:0x1B22B0 STR_PETRIFICATION = 0x8021DFA0; // rom:0x1B22B0
obStrategyName = 0x80186FC4; // rom:0x5CEC4 size:16 obStrategyName = 0x80186FC4; // rom:0x5CEC4 size:16
obGetStrategyName = 0x8016B070; // rom:0x40F70
//obStrategyNameAutonomous = 0x80186F70; // rom:0x5CE70 type:asciz //obStrategyNameAutonomous = 0x80186F70; // rom:0x5CE70 type:asciz
//obStrategyNameAttackStrongest = 0x80186F80; // rom:0x5CE80 type:asciz //obStrategyNameAttackStrongest = 0x80186F80; // rom:0x5CE80 type:asciz
//obStrategyNameAttackLeader = 0x80186F94; // rom:0x5CE94 type:asciz //obStrategyNameAttackLeader = 0x80186F94; // rom:0x5CE94 type:asciz

2
src/data/strategy.c
View File

@ -19,7 +19,7 @@ char obStrategyNameAttackWeakest[] = DECORATE("Attack" NEWLINE INDENT "Weakest")
u8 D_80186FBC[] = { 0x07, 0x02, 0x06, 0x03, 0x05, 0x04, 0x01, 0x00 }; u8 D_80186FBC[] = { 0x07, 0x02, 0x06, 0x03, 0x05, 0x04, 0x01, 0x00 };
/* 5CEC4 80186FC4 */ /* 5CEC4 80186FC4 */
char* obStrategyName[] = { char *obStrategyName[] = {
obStrategyNameAutonomous, obStrategyNameAutonomous,
obStrategyNameAttackStrongest, obStrategyNameAttackStrongest,
obStrategyNameAttackLeader, obStrategyNameAttackLeader,

11
src/segment_obdata/_ob_blushing_ship.c
View File

@ -1,14 +1,15 @@
#include "common.h" #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_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); INCLUDE_ASM(const s32, "segment_obdata/_ob_blushing_ship", func_8016B088);