updating box menu, pre sprite grabbing

This commit is contained in:
The Gears of Progress
2025-03-22 15:57:22 -04:00
parent 91b2534b70
commit 8160bcd276
28 changed files with 911 additions and 271 deletions

View File

@@ -3,6 +3,7 @@
#include "script_var.h"
#include "pokemon_data.h"
#include "debug_mode.h"
#include "global_frame_controller.h"
extern rom_data curr_rom;
@@ -136,9 +137,10 @@ u32 xse_var::get_loc_in_sec30()
// TEXTBOX VAR
void textbox_var::set_text(std::u16string_view nText)
void textbox_var::set_text(const byte nText[])
{
text = nText;
text_length = get_string_length(nText);
}
void textbox_var::set_start()
@@ -154,16 +156,15 @@ void textbox_var::set_virtual_start()
void textbox_var::insert_text(u8 mg_array[])
{
set_start();
for (unsigned int parser = 0; parser < text.length(); parser++)
for (unsigned int parser = 0; parser < text_length; parser++)
{
byte character = get_gen_3_char((char16_t)(text.at(parser)), false);
if (curr_rom.is_hoenn() && (character == 0xFC) && (get_gen_3_char((char16_t)(text.at(parser + 1)), false) == 0x01)) // Removes colored text
if (curr_rom.is_hoenn() && (text[parser] == 0xFC) && (get_gen_3_char((char16_t)(text[parser + 1]), false) == 0x01)) // Removes colored text
{
parser += 2;
}
else
{
mg_array[*curr_loc_ptr] = character;
mg_array[*curr_loc_ptr] = text[parser];
(*curr_loc_ptr)++;
}
}
@@ -174,16 +175,16 @@ void textbox_var::insert_text(u8 mg_array[])
void textbox_var::insert_virtual_text(u8 mg_array[])
{
set_virtual_start();
for (unsigned int parser = 0; parser < text.length(); parser++)
for (unsigned int parser = 0; parser < text_length; parser++)
{
byte character = get_gen_3_char((char16_t)(text.at(parser)), false);
if (curr_rom.is_hoenn() && (character == 0xFC) && (get_gen_3_char((char16_t)(text.at(parser + 1)), false) == 0x01)) // Removes colored text
text[parser];
if (curr_rom.is_hoenn() && (text[parser] == 0xFC) && (get_gen_3_char((char16_t)(text[parser + 1]), false) == 0x01)) // Removes colored text
{
parser += 2;
}
else
{
mg_array[*curr_loc_ptr] = character;
mg_array[*curr_loc_ptr] = text[parser];
(*curr_loc_ptr)++;
}
}