Skip to content

Commit

Permalink
Some renames
Browse files Browse the repository at this point in the history
  • Loading branch information
@robojumper
robojumper committed Nov 4, 2024
1 parent cc72f50 commit b8bbeff
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 20 deletions.
12 changes: 6 additions & 6 deletions config/SOUE01/symbols.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3915,22 +3915,22 @@ setFramesLeftOnPause__15dTagProcessor_cFPQ34nw4r2ut4RectPQ34nw4r2ut15PrintContex
fn_800B5500__15dTagProcessor_cFUcPw = .text:0x800B5500; // type:function size:0x18
fn_800B5520__15dTagProcessor_cFPw = .text:0x800B5520; // type:function size:0x14
fn_800B5540__15dTagProcessor_cFPw = .text:0x800B5540; // type:function size:0x28
fn_800B5570__15dTagProcessor_cFPwPll = .text:0x800B5570; // type:function size:0x110
fn_800B5680__15dTagProcessor_cFPwPwPll = .text:0x800B5680; // type:function size:0x1DC
fn_800B5860__15dTagProcessor_cFPwPwPll = .text:0x800B5860; // type:function size:0x1C0
fn_800B5A20__15dTagProcessor_cFPwPwPll = .text:0x800B5A20; // type:function size:0x3AC
writeHeroname__15dTagProcessor_cFPwPll = .text:0x800B5570; // type:function size:0x110
writeItem__15dTagProcessor_cFPwPwPll = .text:0x800B5680; // type:function size:0x1DC
writeStringArg__15dTagProcessor_cFPwPwPll = .text:0x800B5860; // type:function size:0x1C0
writeNumericArg__15dTagProcessor_cFPwPwPll = .text:0x800B5A20; // type:function size:0x3AC
fn_800B5DD0__15dTagProcessor_cFPwPwPll = .text:0x800B5DD0; // type:function size:0x1FC
fn_800B5FD0__15dTagProcessor_cFUlPwPl = .text:0x800B5FD0; // type:function size:0x10C
fn_800B60E0__15dTagProcessor_cFUcPw = .text:0x800B60E0; // type:function size:0x24
fn_800B6110__15dTagProcessor_cFUcPw = .text:0x800B6110; // type:function size:0x24
fn_800B6140__15dTagProcessor_cFUcPw = .text:0x800B6140; // type:function size:0x14
fn_800B6160__15dTagProcessor_cFUcPw = .text:0x800B6160; // type:function size:0x8
playSound__15dTagProcessor_cFUcPw = .text:0x800B6160; // type:function size:0x8
fn_800B6170__15dTagProcessor_cFUcPw = .text:0x800B6170; // type:function size:0x14
fn_800B6190__15dTagProcessor_cFUcPw = .text:0x800B6190; // type:function size:0x1C
fn_800B61B0__15dTagProcessor_cFUcPw = .text:0x800B61B0; // type:function size:0x18
fn_800B61D0__15dTagProcessor_cFPQ34nw4r2ut4RectPQ34nw4r2ut15PrintContext<w>UcPw = .text:0x800B61D0; // type:function size:0x64
changeScale__15dTagProcessor_cFPQ34nw4r2ut4RectPQ34nw4r2ut15PrintContext<w>b = .text:0x800B6240; // type:function size:0xDC
fn_800B6320__15dTagProcessor_cFP10dTextBox_cPwf = .text:0x800B6320; // type:function size:0x12C
writeIcon__15dTagProcessor_cFP10dTextBox_cPwf = .text:0x800B6320; // type:function size:0x12C
fn_800B6450__15dTagProcessor_cFPQ34nw4r2ut4RectPQ34nw4r2ut15PrintContext<w>UcPw = .text:0x800B6450; // type:function size:0x340
fn_800B6790 = .text:0x800B6790; // type:function size:0x750
fn_800B6EE0__15dTagProcessor_cFPQ34nw4r2ut4RectPQ34nw4r2ut15PrintContext<w>Pw = .text:0x800B6EE0; // type:function size:0x1E8
Expand Down
12 changes: 6 additions & 6 deletions include/d/d_tag_processor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ class dTagProcessor_c : public nw4r::ut::TagProcessorBase<wchar_t> {
nw4r::ut::Operation ProcessTags(nw4r::ut::Rect *rect, u16 ch, nw4r::ut::PrintContext<wchar_t> *ctx);

void changeScale(nw4r::ut::Rect *rect, nw4r::ut::PrintContext<wchar_t> *ctx, bool);
wchar_t *fn_800B5680(wchar_t *dest, wchar_t *src, s32*, s32);
wchar_t *fn_800B5860(wchar_t *dest, wchar_t *src, s32*, s32);
wchar_t *fn_800B5A20(wchar_t *dest, wchar_t *src, s32*, s32);
wchar_t *writeItem(wchar_t *dest, wchar_t *src, s32*, s32);
wchar_t *writeStringArg(wchar_t *dest, wchar_t *src, s32*, s32);
wchar_t *writeNumericArg(wchar_t *dest, wchar_t *src, s32*, s32);
void fn_800B4FF0(nw4r::ut::Rect *rect, nw4r::ut::PrintContext<wchar_t> *ctx, u8 cmdLen, wchar_t *ptr);
void fn_800B6450(nw4r::ut::Rect *rect, nw4r::ut::PrintContext<wchar_t> *ctx, u8 cmdLen, wchar_t *ptr);
void fn_800B6EE0(nw4r::ut::Rect *rect, nw4r::ut::PrintContext<wchar_t> *ctx, wchar_t *ptr);
Expand All @@ -33,7 +33,7 @@ class dTagProcessor_c : public nw4r::ut::TagProcessorBase<wchar_t> {
void fn_800B60E0(u8 cmdLen, wchar_t *ptr);
void fn_800B6110(u8 cmdLen, wchar_t *ptr);
void fn_800B6140(u8 cmdLen, wchar_t *ptr);
void fn_800B6160(u8 cmdLen, wchar_t *ptr);
void playSound(u8 cmdLen, wchar_t *ptr);
void fn_800B6170(u8 cmdLen, wchar_t *ptr);
void fn_800B6190(u8 cmdLen, wchar_t *ptr);
void fn_800B61B0(u8 cmdLen, wchar_t *ptr);
Expand All @@ -52,10 +52,10 @@ class dTagProcessor_c : public nw4r::ut::TagProcessorBase<wchar_t> {
static f32 fn_800B8040(s8, u32);
wchar_t *fn_800B5FD0(u32, wchar_t *, s32 *);
wchar_t *writeTextNormal(const wchar_t *src, wchar_t *dest, s32*, u8 cmdLen, s32);
wchar_t *fn_800B5570(wchar_t *dest, s32*, s32);
wchar_t *writeHeroname(wchar_t *dest, s32*, s32);
wchar_t *fn_800B5DD0(wchar_t *dest, wchar_t *src, s32*, s32);
void fn_800B5520(wchar_t *src);
void fn_800B6320(dTextBox_c *textBox, wchar_t *cmd, f32);
void writeIcon(dTextBox_c *textBox, wchar_t *cmd, f32);
char fn_800B7880(u32);
void fn_800B70D0(nw4r::ut::TextWriterBase<wchar_t> *, nw4r::ut::PrintContext<wchar_t> *ctx, u16 c, s32);

Expand Down
19 changes: 11 additions & 8 deletions src/d/d_tag_processor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,14 +360,14 @@ void dTagProcessor_c::eventFlowTextProcessingRelated(
case 0x10010: fn_800B5520(endPtr); break;
case 0x20004:
if (textBox != nullptr) {
fn_800B6320(textBox, endPtr, float2);
writeIcon(textBox, endPtr, float2);
}
writePtr = writeTextNormal(src, writePtr, &local_b4, cmdLen, state4);
break;
case 0x20000: writePtr = fn_800B5570(writePtr, &local_b4, state4); break;
case 0x20001: writePtr = fn_800B5680(writePtr, endPtr, &local_b4, state4); break;
case 0x20002: writePtr = fn_800B5860(writePtr, endPtr, &local_b4, state4); break;
case 0x20003: writePtr = fn_800B5A20(writePtr, endPtr, &local_b4, state4); break;
case 0x20000: writePtr = writeHeroname(writePtr, &local_b4, state4); break;
case 0x20001: writePtr = writeItem(writePtr, endPtr, &local_b4, state4); break;
case 0x20002: writePtr = writeStringArg(writePtr, endPtr, &local_b4, state4); break;
case 0x20003: writePtr = writeNumericArg(writePtr, endPtr, &local_b4, state4); break;

case 0x30004: writePtr = fn_800B5DD0(writePtr, endPtr, &local_b4, state4); break;
case 0x30001:
Expand Down Expand Up @@ -505,6 +505,7 @@ nw4r::ut::Operation dTagProcessor_c::ProcessTags(nw4r::ut::Rect *rect, u16 ch, n
break;
case 0x2: setScale(rect, ctx, cmdLen, endPtr); break;
case 0x10004:
// Pause
if (rect == nullptr && field_0xEE1 == 0) {
if (field_0xEED == 0 && field_0x8F0 == field_0x838) {
setFramesLeftOnPause(rect, ctx, cmdLen, endPtr);
Expand Down Expand Up @@ -557,16 +558,18 @@ nw4r::ut::Operation dTagProcessor_c::ProcessTags(nw4r::ut::Rect *rect, u16 ch, n
}
break;
case 0x1000B:
// Sound
if (rect == nullptr && field_0xEE1 == 0) {
if (field_0xEE8 == 0 && mNumericArgsCopy[6] == field_0x888) {
fn_800B6160(cmdLen, endPtr);
playSound(cmdLen, endPtr);
field_0xEE8 = 1;
field_0x888++;
}
mNumericArgsCopy[6]++;
}
break;
case 0x1000C:
// "entrypoint"
if (rect == nullptr && field_0xEE1 == 0) {
if (field_0xEEA == 0 && mNumericArgsCopy[8] == field_0x890) {
fn_800B6170(cmdLen, endPtr);
Expand Down Expand Up @@ -767,7 +770,7 @@ void dTagProcessor_c::fn_800B5520(wchar_t *src) {
field_0x820 = ((u32 *)src)[1];
}

wchar_t *dTagProcessor_c::fn_800B5570(wchar_t *dest, s32 *outArg, s32 arg) {
wchar_t *dTagProcessor_c::writeHeroname(wchar_t *dest, s32 *outArg, s32 arg) {
if (FileManager::sInstance->getHeroname()[0] != '\0') {
for (int i = 0; FileManager::sInstance->getHeroname()[i] != '\0'; i++) {
if (arg != 0 && field_0x90E != 0) {
Expand Down Expand Up @@ -806,7 +809,7 @@ void dTagProcessor_c::fn_800B6140(u8 cmdLen, wchar_t *ptr) {
field_0x864 = ptr[0];
field_0x868 = ptr[1];
}
void dTagProcessor_c::fn_800B6160(u8 cmdLen, wchar_t *ptr) {}
void dTagProcessor_c::playSound(u8 cmdLen, wchar_t *ptr) {}
void dTagProcessor_c::fn_800B6170(u8 cmdLen, wchar_t *ptr) {
field_0x8FC = ptr[0];
field_0x900 = ptr[1];
Expand Down

0 comments on commit b8bbeff

Please sign in to comment.