diff --git a/include/button_handler.h b/include/button_handler.h
index 79e3348..b17d870 100644
--- a/include/button_handler.h
+++ b/include/button_handler.h
@@ -7,8 +7,8 @@ class Button
 {
 public:
     Button();
-    Button(OBJ_ATTR *L, OBJ_ATTR *R, u32 tidL, u32 tidR); // wide buttons
-    Button(OBJ_ATTR *B, u32 ntidB);                       // short button
+    Button(OBJ_ATTR *L, OBJ_ATTR *R); // wide buttons
+    Button(OBJ_ATTR *B);              // short button
     bool isWide;
     void set_location(int x, int y);
     void set_highlight(bool highlight);
@@ -21,8 +21,6 @@ private:
     bool highlighted;
     OBJ_ATTR *button_L;
     OBJ_ATTR *button_R;
-    u32 tidL;
-    u32 tidR;
 };
 
 #endif
\ No newline at end of file
diff --git a/include/dex_handler.h b/include/dex_handler.h
index 08e7e86..feccb22 100644
--- a/include/dex_handler.h
+++ b/include/dex_handler.h
@@ -7,9 +7,8 @@ class Dex
 {
 public:
     Dex();
-    Dex(OBJ_ATTR *L, OBJ_ATTR *M, OBJ_ATTR *R, u32 tidL, u32 tidM, u32 tidR);
+    Dex(OBJ_ATTR *L, OBJ_ATTR *M, OBJ_ATTR *R);
     void set_location(int x, int y);
-    void set_highlight(bool highlight);
     void hide();
     void show();
 
@@ -20,9 +19,6 @@ private:
     OBJ_ATTR *dex_L;
     OBJ_ATTR *dex_M;
     OBJ_ATTR *dex_R;
-    u32 tidL;
-    u32 tidM;
-    u32 tidR;
 };
 
 #endif
\ No newline at end of file
diff --git a/include/main_menu.h b/include/main_menu.h
index 8ac3e1f..3a32412 100644
--- a/include/main_menu.h
+++ b/include/main_menu.h
@@ -2,6 +2,7 @@
 #define MAIN_MENU_H
 
 #include <tonc.h>
+#include <vector>
 
 #include "button_handler.h"
 
@@ -26,15 +27,33 @@
 #define EXITING -2
 #define DISABLE -3
 
-void main_menu_btn_init(Button nButton, int index);
-int main_menu_loop();
-void main_menu_enter();
-void main_menu_exit();
-void show_lang_btns();
-void hide_lang_btns();
-void show_main_btns();
-void hide_main_btns();
-void highlight_lang_btn(int index, bool highlight);
-void set_arrow_point(int index);
 
+
+class Button_Menu
+{
+public:
+    Button_Menu(int nRows, int nColumns, int nButton_width, int nButton_height);
+    int button_main();
+    void add_button(Button btn, int return_val);
+    void hide_buttons();
+    void show_buttons();
+    void organize_buttons();
+    unsigned int get_pos_from_xy(int nX, int nY);
+    unsigned int get_x_from_pos(int nPos);
+    unsigned int get_y_from_pos(int nPos);
+    void set_xy_min_max(int nX_min, int nX_max, int nY_min, int nY_max);
+
+private:
+    std::vector<Button> button_vector;
+    std::vector<int> return_values;
+    int columns;
+    int rows;
+    int button_height;
+    int button_width;
+    unsigned int curr_position;
+    int x_min;
+    int x_max;
+    int y_min;
+    int y_max;
+};
 #endif
\ No newline at end of file
diff --git a/include/script_array.h b/include/script_array.h
index ce24a3a..0fca004 100644
--- a/include/script_array.h
+++ b/include/script_array.h
@@ -30,23 +30,28 @@
 #define DIA_MG_OTHER_EVENT          21
 #define DIA_PKMN_TO_COLLECT         22
 #define DIA_NO_VALID_PKMN           23
+#define DIA_WHAT_GAME               24
+#define DIA_WHAT_LANG               25
+#define DIA_ASK_QUEST               26
 
-#define                    DIA_SIZE 24
+#define                    DIA_SIZE 27
 #define DIA_END DIA_SIZE
 
 // Commands
-#define SCRIPT_START        DIA_END + 0
-#define CMD_START_LINK      DIA_END + 1
-#define CMD_IMPORT_POKEMON  DIA_END + 2     // This one is special because it can be true or false
-#define CMD_BACK_TO_MENU    DIA_END + 3
-#define CMD_SHOW_PROF       DIA_END + 4
-#define CMD_HIDE_PROF       DIA_END + 5
-#define CMD_SET_TUTOR_TRUE  DIA_END + 6
-#define CMD_END_SCRIPT      DIA_END + 7
-#define CMD_ASK_LANG        DIA_END + 8
-#define CMD_ASK_GAME        DIA_END + 9
+#define SCRIPT_START            DIA_END + 0
+#define CMD_START_LINK          DIA_END + 1
+#define CMD_IMPORT_POKEMON      DIA_END + 2     // This one is special because it can be true or false
+#define CMD_BACK_TO_MENU        DIA_END + 3
+#define CMD_SHOW_PROF           DIA_END + 4
+#define CMD_HIDE_PROF           DIA_END + 5
+#define CMD_SET_TUTOR_TRUE      DIA_END + 6
+#define CMD_END_SCRIPT          DIA_END + 7
+#define CMD_GAME_MENU           DIA_END + 8
+#define CMD_LANG_MENU           DIA_END + 9
+#define CMD_SLIDE_PROF_LEFT     DIA_END + 10
+#define CMD_SLIDE_PROF_RIGHT    DIA_END + 11
 
-#define                     CMD_SIZE  10
+#define                     CMD_SIZE  12
 #define CMDS_END DIA_END + CMD_SIZE
 
 // Conditionals
@@ -76,7 +81,7 @@ extern rom_data curr_rom;
 
 void populate_script();
 void populate_dialogue();
-void add_script_party_var(Pokemon_Party var);
+void populate_buttons();
 bool run_conditional(int index);
 
 #endif
\ No newline at end of file
diff --git a/include/sprite_data.h b/include/sprite_data.h
index 5dc05e7..c3d2d1f 100644
--- a/include/sprite_data.h
+++ b/include/sprite_data.h
@@ -1,46 +1,67 @@
+#ifndef SPRITE_DATA_H
+#define SPRITE_DATA_H
+
 #include <tonc.h>
 
 extern OBJ_ATTR obj_buffer[128];
 extern OBJ_AFFINE *obj_aff_buffer;
+extern int num_sprites;
 
+#include "metr.h"
 extern OBJ_ATTR *testroid;
+#include "prof.h"
 extern OBJ_ATTR *prof;
+#include "btn_t_l.h"
 extern OBJ_ATTR *btn_t_l;
+#include "btn_t_r.h"
 extern OBJ_ATTR *btn_t_r;
+#include "btn_p_l.h"
 extern OBJ_ATTR *btn_p_l;
+#include "btn_p_r.h"
 extern OBJ_ATTR *btn_p_r;
+#include "btn_c_l.h"
 extern OBJ_ATTR *btn_c_l;
+#include "btn_c_r.h"
 extern OBJ_ATTR *btn_c_r;
-extern OBJ_ATTR *dex_l[];
-extern OBJ_ATTR *dex_m[];
-extern OBJ_ATTR *dex_r[];
+#include "btn_d_l.h"
 extern OBJ_ATTR *btn_d_l;
+#include "btn_d_r.h"
 extern OBJ_ATTR *btn_d_r;
+
+#include "dex_l.h"
+#define DEX_SPRITE_LEFT 0
+#include "dex_m.h"
+#define DEX_SPRITE_MID 1
+#include "dex_r.h"
+#define DEX_SPRITE_RIGHT 2
+extern OBJ_ATTR *dex_sprites[3][6];
+
+#include "btn_lang_eng.h"
 extern OBJ_ATTR *btn_lang_eng;
+#include "btn_lang_fre.h"
 extern OBJ_ATTR *btn_lang_fre;
+#include "btn_lang_ita.h"
 extern OBJ_ATTR *btn_lang_ita;
+#include "btn_lang_ger.h"
 extern OBJ_ATTR *btn_lang_ger;
+#include "btn_lang_spa.h"
 extern OBJ_ATTR *btn_lang_spa;
+#include "btn_lang_kor.h"
 extern OBJ_ATTR *btn_lang_kor;
+#include "lang_arrow.h"
 extern OBJ_ATTR *lang_arrow;
 
+#define METR_PAL 0
+#define PROF_PAL 1
+#define BTN_PAL 2
+#define BTN_LIT_PAL 3
 
+void load_sprite(OBJ_ATTR *sprite, const unsigned int objTiles[], int objTilesLen,
+                 u32 &tile_id, u32 pal_bank, int attr0, int attr1, u32 priority);
 void load_background();
 void load_textbox_background();
 void load_opening_background();
-void load_testroid();
-void load_professor();
-void load_btn_t_l();
-void load_btn_t_r();
-void load_btn_p_l();
-void load_btn_p_r();
-void load_btn_c_l();
-void load_btn_c_r();
-void load_dex_l();
-void load_dex_m();
-void load_dex_r();
-void load_btn_d_l();
-void load_btn_d_r();
+void load_sprites();
 void load_btn_lang_eng();
 void load_btn_lang_fre();
 void load_btn_lang_ita();
@@ -48,4 +69,5 @@ void load_btn_lang_ger();
 void load_btn_lang_spa();
 void load_btn_lang_kor();
 void load_lang_arrow();
-#define NUM_SPRITES 35
\ No newline at end of file
+
+#endif
\ No newline at end of file
diff --git a/include/text_engine.h b/include/text_engine.h
index da428fd..e052b54 100644
--- a/include/text_engine.h
+++ b/include/text_engine.h
@@ -15,11 +15,10 @@
 #define BOTTOM V_MAX
 
     void init_text_engine();
-    void text_next_frame();
+    int text_loop();
     int text_next_obj_id(script_obj current_line);
-    void text_enable();
-    void text_disable();
     void show_text_box();
     void hide_text_box();
+    void set_text_exit();
 
 #endif
\ No newline at end of file
diff --git a/source/button_handler.cpp b/source/button_handler.cpp
index 3e9a579..8a01f5a 100644
--- a/source/button_handler.cpp
+++ b/source/button_handler.cpp
@@ -2,20 +2,17 @@
 
 Button::Button() {}
 
-Button::Button(OBJ_ATTR *L, OBJ_ATTR *R, u32 ntidL, u32 ntidR)
+Button::Button(OBJ_ATTR *L, OBJ_ATTR *R)
 {
     button_L = L;
     button_R = R;
-    tidL = ntidL;
-    tidR = ntidR;
     isWide = true;
     hide();
 }
 
-Button::Button(OBJ_ATTR *L, u32 ntidL)
+Button::Button(OBJ_ATTR *B)
 {
-    button_L = L;
-    tidL = ntidL;
+    button_L = B;
     isWide = false;
     hide();
 }
@@ -32,10 +29,13 @@ void Button::set_location(int nx, int ny)
 }
 void Button::set_highlight(bool highlight)
 {
-    button_L->attr2 = ATTR2_BUILD(tidL, (highlight ? 3 : 2), 0);
+    button_L->attr2 &= ~ATTR2_PALBANK_MASK;
+    button_L->attr2 |= ATTR2_PALBANK(highlight ? 3 : 2);
+
     if (isWide)
     {
-        button_R->attr2 = ATTR2_BUILD(tidR, (highlight ? 3 : 2), 0);
+        button_R->attr2 &= ~ATTR2_PALBANK_MASK;
+        button_R->attr2 |= ATTR2_PALBANK(highlight ? 3 : 2);
     }
 }
 void Button::hide()
diff --git a/source/dex_handler.cpp b/source/dex_handler.cpp
index b456ffa..6849d89 100644
--- a/source/dex_handler.cpp
+++ b/source/dex_handler.cpp
@@ -2,14 +2,11 @@
 
 Dex::Dex(){}
 
-Dex::Dex(OBJ_ATTR *L, OBJ_ATTR *M, OBJ_ATTR *R, u32 ntidL, u32 ntidM, u32 ntidR)
+Dex::Dex(OBJ_ATTR *L, OBJ_ATTR *M, OBJ_ATTR *R)
 {
     dex_L = L;
     dex_M = M;
     dex_R = R;
-    tidL = ntidL;
-    tidM = ntidM;
-    tidR = ntidR;
     hide();
 }
 void Dex::set_location(int nx, int ny)
@@ -20,17 +17,15 @@ void Dex::set_location(int nx, int ny)
     obj_set_pos(dex_M, x + 64, y);
     obj_set_pos(dex_R, x + 128, y);
 }
-void Dex::set_highlight(bool highlight)
-{
-    dex_L->attr2 = ATTR2_BUILD(tidL, (highlight ? 3 : 2), 2);
-    dex_M->attr2 = ATTR2_BUILD(tidM, (highlight ? 3 : 2), 2);
-    dex_R->attr2 = ATTR2_BUILD(tidR, (highlight ? 3 : 2), 2);
-}
 void Dex::hide()
 {
-    obj_hide_multi(dex_L, 3);
+    obj_hide(dex_L);
+    obj_hide(dex_M);
+    obj_hide(dex_R);
 }
 void Dex::show()
 {
-    obj_unhide_multi(dex_L, 0, 3);
+    obj_unhide(dex_L, 0);
+    obj_unhide(dex_M, 0);
+    obj_unhide(dex_R, 0);
 }
\ No newline at end of file
diff --git a/source/global_frame_controller.cpp b/source/global_frame_controller.cpp
index 724f286..3d9c8aa 100644
--- a/source/global_frame_controller.cpp
+++ b/source/global_frame_controller.cpp
@@ -15,8 +15,7 @@ void global_next_frame()
     // tte_set_pos(0, 0);
     // tte_write(std::to_string(get_rand_u32()).c_str());
     background_frame();
-    text_next_frame();
-    oam_copy(oam_mem, obj_buffer, NUM_SPRITES);
+    oam_copy(oam_mem, obj_buffer, num_sprites);
     VBlankIntrWait();
     // mmFrame(); //Music
     global_frame_count++;
diff --git a/source/main.cpp b/source/main.cpp
index 06e6d0a..cb0768d 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -57,6 +57,7 @@ TODO:
 int delay_counter = 0;
 bool skip = true;
 rom_data curr_rom;
+Button_Menu main_menu(3, 1, 96, 32);
 
 /*
 int test_main(void) Music
@@ -94,39 +95,13 @@ void load_graphics()
 	load_opening_background();
 	load_background();
 	load_textbox_background();
-	load_testroid();
-	load_professor();
-	load_btn_t_l();
-	load_btn_t_r();
-	load_btn_p_l();
-	load_btn_p_r();
-	load_btn_c_l();
-	load_btn_c_r();
-	load_dex_l();
-	load_dex_m();
-	load_dex_r();
-	load_btn_d_l();
-	load_btn_d_r();
-	load_btn_lang_eng();
-	load_btn_lang_fre();
-	load_btn_lang_ita();
-	load_btn_lang_ger();
-	load_btn_lang_spa();
-	load_btn_lang_kor();
-	load_lang_arrow();
+	load_sprites();
 
-	main_menu_btn_init(Button(btn_t_l, btn_t_r, 128, 160), BTN_TRANSFER);
-	main_menu_btn_init(Button(btn_p_l, btn_p_r, 192, 224), BTN_POKEDEX);
-	main_menu_btn_init(Button(btn_c_l, btn_c_r, 256, 288), BTN_CREDITS);
-	main_menu_btn_init(Button(btn_d_l, btn_d_r, 416, 448), BTN_LANGUAGE);
-
-	main_menu_btn_init(Button(btn_lang_eng, 480), BTN_ENG);
-	main_menu_btn_init(Button(btn_lang_fre, 512), BTN_FRE);
-	main_menu_btn_init(Button(btn_lang_ita, 544), BTN_ITA);
-	main_menu_btn_init(Button(btn_lang_ger, 576), BTN_GER);
-	main_menu_btn_init(Button(btn_lang_spa, 608), BTN_SPA);
-	main_menu_btn_init(Button(btn_lang_kor, 640), BTN_KOR);
-	main_menu_btn_init(Button(lang_arrow, 672), LANG_ARROW);
+	// Set up main menu
+	main_menu.add_button(Button(btn_t_l, btn_t_r), BTN_TRANSFER);
+	main_menu.add_button(Button(btn_p_l, btn_p_r), BTN_POKEDEX);
+	//main_menu.add_button(Button(btn_d_l, btn_d_r), BTN_LANGUAGE);
+	main_menu.add_button(Button(btn_c_l, btn_c_r), BTN_CREDITS);
 }
 
 void initalization_script(void)
@@ -154,14 +129,13 @@ void initalization_script(void)
 	// Prepare dialouge
 	populate_dialogue();
 	populate_script();
+	populate_buttons();
 	init_text_engine();
 
 	// Initalize the Pokedex
 	pokedex_init();
 
-	// Disable text (this is not a good way to do this)
-	text_disable();
-	
+	// Set the random seed
 	rand_set_seed(0x1216);
 };
 
@@ -202,6 +176,57 @@ void first_load_message(void)
 	tte_erase_rect(0, 0, H_MAX, V_MAX);
 }
 
+int credits()
+{
+	#define CREDITS_ARRAY_SIZE 15
+	int curr_credits_num = 0;
+	std::string credits_array[CREDITS_ARRAY_SIZE] = {
+		"Developed by:\n\n\nThe Gears\nof Progress",
+		"Built using:\n\n\n-DevkitPro\n-LibTonc\n-LibGBA",
+		"Inspired by the\nworks of:\n\n-Goppier\n-Lorenzooone\n-im a blisy\n-RETIRE",
+		"Programs used:\n\n\n-HexManiacAdvance\n-PKHeX\n-WC3Tool\n-Usenti\n",
+		"Open Source Code and\nLibraries:\n\n-libtonc-examples\n-PokemonGen3toGenX\n-gba-link-connection\n-awesome-gbadev\n-arduino-poke-gen2",
+		"Research resources:\n\n-arm-docs\n-PokemonGen3toGenX\n\nFull links can be\nfound on this\nprogram's GitHub",
+		"ROM data obtained\nfrom decompilations created by the PRET team",
+		"Pok@mon data\nobtained from:\n\n-Bulbapedia\n-Serebii\n-PokeAPI.com",
+		"Discord community\nassistance:\n\n-Hex Maniac Advance\n Development\n-gbadev\n-pret",
+		"Sprite work:\n\n\n-lite_thespark",
+		"Writing assistance:\n\n\n-Mad",
+		"An immense thanks to\nLorenzooone for\ntheir assistance in\nreading/writing save\ndata. Without them,\nthis project would\nnot have been\npossible.",
+		"Special thanks:\n\n\nEnn, Roku, Luca,\nArctic, and everyone\nwho has listened to me talk about this\nfor months",
+		"All Pok@mon names,\nsprites, and names\nof related resources\nare copyright\nNintendo,\nCreatures Inc.,\nand GAME FREAK Inc.",
+		"This project is not endorsed or\nsupported by\nGameFreak/Nintendo.\n\nPlease support the\noriginal developers.",
+	};
+
+	while (true)
+	{
+		tte_set_pos(40, 24);
+		tte_set_margins(40, 24, 206, 104);
+		tte_erase_screen();
+		tte_write(credits_array[curr_credits_num].c_str());
+		REG_BG0CNT = (REG_BG0CNT & ~BG_PRIO_MASK) | BG_PRIO(3);
+		REG_BG2CNT = (REG_BG2CNT & ~BG_PRIO_MASK) | BG_PRIO(2);
+		REG_BG2VOFS = 0;
+		if (key_hit(KEY_B))
+		{
+			tte_erase_rect(0, 0, H_MAX, V_MAX);
+			REG_BG0CNT = (REG_BG0CNT & ~BG_PRIO_MASK) | BG_PRIO(2);
+			REG_BG2CNT = (REG_BG2CNT & ~BG_PRIO_MASK) | BG_PRIO(3);
+			REG_BG2VOFS = 96;
+			return 0;
+		}
+		if (key_hit(KEY_LEFT) && curr_credits_num > 0)
+		{
+			curr_credits_num--;
+		}
+		if (key_hit(KEY_RIGHT) && curr_credits_num < (CREDITS_ARRAY_SIZE - 1))
+		{
+			curr_credits_num++;
+		}
+		global_next_frame();
+	}
+}
+
 int main(void)
 {
 	initalization_script();
@@ -255,34 +280,8 @@ int main(void)
 
 	// Set up blend to fade to white/black
 
-	global_next_frame();
-	show_main_btns();
-	int curr_lang_btn_num = get_def_lang_num();
-	int old_lang_btn_num = -1;
-	set_arrow_point(curr_lang_btn_num);
-
-#define CREDITS_ARRAY_SIZE 15
-	int curr_credits_num = 0;
-	std::string credits_array[CREDITS_ARRAY_SIZE] = {
-		"Developed by:\n\n\nThe Gears\nof Progress",
-		"Built using:\n\n\n-DevkitPro\n-LibTonc\n-LibGBA",
-		"Inspired by the\nworks of:\n\n-Goppier\n-Lorenzooone\n-im a blisy\n-RETIRE",
-		"Programs used:\n\n\n-HexManiacAdvance\n-PKHeX\n-WC3Tool\n-Usenti\n",
-		"Open Source Code and\nLibraries:\n\n-libtonc-examples\n-PokemonGen3toGenX\n-gba-link-connection\n-awesome-gbadev\n-arduino-poke-gen2",
-		"Research resources:\n\n-arm-docs\n-PokemonGen3toGenX\n\nFull links can be\nfound on this\nprogram's GitHub",
-		"ROM data obtained\nfrom decompilations created by the PRET team",
-		"Pok@mon data\nobtained from:\n\n-Bulbapedia\n-Serebii\n-PokeAPI.com",
-		"Discord community\nassistance:\n\n-Hex Maniac Advance\n Development\n-gbadev\n-pret",
-		"Sprite work:\n\n\n-lite_thespark",
-		"Writing assistance:\n\n\n-Mad",
-		"An immense thanks to\nLorenzooone for\ntheir assistance in\nreading/writing save\ndata. Without them,\nthis project would\nnot have been\npossible.",
-		"Special thanks:\n\n\nEnn, Roku, Luca,\nArctic, and everyone\nwho has listened to me talk about this\nfor months",
-		"All Pok@mon names,\nsprites, and names\nof related resources\nare copyright\nNintendo,\nCreatures Inc.,\nand GAME FREAK Inc.",
-		"This project is not endorsed or\nsupported by\nGameFreak/Nintendo.\n\nPlease support the\noriginal developers.",
-	};
-
+	key_poll(); // Reset the keys
 	curr_rom.load_rom();
-
 	// MAIN LOOP
 	while (1)
 	{
@@ -291,86 +290,19 @@ int main(void)
 			print_mem_section();
 			curr_rom.print_rom_info();
 		}
-		switch (main_menu_loop())
+		switch (main_menu.button_main())
 		{
 		case (BTN_TRANSFER):
-			text_enable();
+			text_loop();
 			break;
 		case (BTN_POKEDEX):
-			pokedex_show();
 			pokedex_loop();
-			if (key_hit(KEY_B))
-			{
-				pokedex_hide();
-				main_menu_exit();
-			}
-			break;
-		case (BTN_LANGUAGE):
-			REG_BG2CNT = (REG_BG2CNT & ~BG_PRIO_MASK) | BG_PRIO(1); // Enable text box
-			show_lang_btns();
-			tte_set_pos(LEFT, TOP);
-			tte_write("Choose the default language\nfor transfering from a non\nJapanese game. Setting will\nbe saved after next transfer.");
-			if (key_hit(KEY_LEFT) && ((curr_lang_btn_num % 3) != 0))
-			{
-				curr_lang_btn_num--;
-			}
-			if (key_hit(KEY_RIGHT) && ((curr_lang_btn_num % 3) != 2))
-			{
-				curr_lang_btn_num++;
-			}
-			if (key_hit(KEY_UP) && ((curr_lang_btn_num > 2)))
-			{
-				curr_lang_btn_num -= 3;
-			}
-			if (key_hit(KEY_DOWN) && ((curr_lang_btn_num <= 2)))
-			{
-				curr_lang_btn_num += 3;
-			}
-			if (curr_lang_btn_num != old_lang_btn_num)
-			{
-				highlight_lang_btn(old_lang_btn_num, false);
-				highlight_lang_btn(curr_lang_btn_num, true);
-				old_lang_btn_num = curr_lang_btn_num;
-			}
-			if (key_hit(KEY_A))
-			{
-				set_arrow_point(curr_lang_btn_num);
-				set_def_lang(curr_lang_btn_num);
-			}
-			if (key_hit(KEY_B))
-			{
-				hide_lang_btns();
-				main_menu_exit();
-				tte_erase_screen();
-				hide_text_box();
-			}
 			break;
 		case (BTN_CREDITS):
-			tte_set_pos(40, 24);
-			tte_set_margins(40, 24, 206, 104);
-			tte_erase_screen();
-			tte_write(credits_array[curr_credits_num].c_str());
-			REG_BG0CNT = (REG_BG0CNT & ~BG_PRIO_MASK) | BG_PRIO(3);
-			REG_BG2CNT = (REG_BG2CNT & ~BG_PRIO_MASK) | BG_PRIO(2);
-			REG_BG2VOFS = 0;
-			if (key_hit(KEY_B))
-			{
-				tte_erase_rect(0, 0, H_MAX, V_MAX);
-				REG_BG0CNT = (REG_BG0CNT & ~BG_PRIO_MASK) | BG_PRIO(2);
-				REG_BG2CNT = (REG_BG2CNT & ~BG_PRIO_MASK) | BG_PRIO(3);
-				REG_BG2VOFS = 96;
-				main_menu_exit();
-			}
-			if (key_hit(KEY_LEFT) && curr_credits_num > 0)
-			{
-				curr_credits_num--;
-			}
-			if (key_hit(KEY_RIGHT) && curr_credits_num < (CREDITS_ARRAY_SIZE - 1))
-			{
-				curr_credits_num++;
-			}
+			credits();
 			break;
+		default:
+			global_next_frame();
 		}
-		global_next_frame();
 	}
 }
\ No newline at end of file
diff --git a/source/main_menu.cpp b/source/main_menu.cpp
index 2e13756..63f12ad 100644
--- a/source/main_menu.cpp
+++ b/source/main_menu.cpp
@@ -2,160 +2,126 @@
 #include "main_menu.h"
 #include "button_handler.h"
 #include "save_data_manager.h"
+#include "global_frame_controller.h"
 
-#define MAX_X_CORD 72 // 128
-
-int menu_slot = 1;
-int old_menu_slot = 0;
-int menu_mode = BTN_MAIN_MENU;
-int ani_mode = 0;
-int menu_x_cord = MAX_X_CORD;
-int lang_btn_slot;
-int old_lang_btn_slot;
-
-Button wide_button_array[WIDE_BUTTON_ARRAY_SIZE];
-Button lang_button_array[LANG_BUTTON_ARRAY_SIZE];
-
-void main_menu_btn_init(Button nButton, int index)
+Button_Menu::Button_Menu(int nRows, int nColumns, int nButton_width, int nButton_height)
 {
-    if (nButton.isWide)
-    {
-        wide_button_array[index] = nButton;
-        wide_button_array[index].set_location(MAX_X_CORD, 7 + (38 * (index - 1)));
-        wide_button_array[index].hide();
-    }
-    else
-    {
-        lang_button_array[index] = nButton;
-        lang_button_array[index].set_location(30 + ((40 + 30) * (index % 3)), 24 + ((24 + 24) * (index / 3)));
-        lang_button_array[index].hide();
-    }
+    columns = nColumns;
+    rows = nRows;
+    button_height = nButton_height;
+    button_width = nButton_width;
+    curr_position = 0;
+    x_min = 0;
+    x_max = 240;
+    y_min = 0;
+    y_max = 160;
 }
 
-int main_menu_loop()
+void Button_Menu::set_xy_min_max(int nX_min, int nX_max, int nY_min, int nY_max){
+    x_min = nX_min;
+    x_max = nX_max;
+    y_min = nY_min;
+    y_max = nY_max;
+}
+
+int Button_Menu::button_main()
 {
-    switch (ani_mode)
+    tte_set_pos(0, 0);
+    organize_buttons();
+    show_buttons();
+    button_vector.at(curr_position).set_highlight(true);
+    int curr_x;
+    int curr_y;
+
+    key_poll(); // Reset the buttons
+
+    while (true)
     {
-    case ENTERING:
-    {
-        menu_x_cord = menu_x_cord + 4;
-        for (int i = 1; i < (WIDE_BUTTON_ARRAY_SIZE + 1); i++)
+        curr_x = get_x_from_pos(curr_position);
+        curr_y = get_y_from_pos(curr_position);
+
+        if (key_hit(KEY_RIGHT) && (curr_x < (columns - 1)))
         {
-            wide_button_array[i].set_location(menu_x_cord, 7 + (38 * (i - 1)));
+            curr_x++;
         }
-        if (menu_x_cord > 240)
+        else if (key_hit(KEY_DOWN) && (curr_y < (rows - 1)))
         {
-            ani_mode = DISABLE;
+            curr_y++;
         }
-        break;
-    }
-    case EXITING:
-    {
-        menu_x_cord = menu_x_cord - 4;
-        for (int i = 1; i < (WIDE_BUTTON_ARRAY_SIZE + 1); i++)
+        else if (key_hit(KEY_LEFT) && (curr_x > 0))
         {
-            wide_button_array[i].set_location(menu_x_cord, 7 + (38 * (i - 1)));
+            curr_x--;
         }
-        if (menu_x_cord <= MAX_X_CORD)
+        else if (key_hit(KEY_UP) && (curr_y > 0))
         {
-            ani_mode = BTN_MAIN_MENU;
+            curr_y--;
         }
-        break;
-    }
-    case BTN_MAIN_MENU:
-    {
-        if (key_hit(KEY_DOWN))
+        else if (key_hit(KEY_A))
         {
-            if (menu_slot != (WIDE_BUTTON_ARRAY_SIZE - 1))
-            {
-                menu_slot++;
-            }
+            hide_buttons();
+            return return_values.at(curr_position);
         }
 
-        if (key_hit(KEY_UP))
+        if (get_pos_from_xy(curr_x, curr_y) != curr_position)
         {
-            if (menu_slot != BTN_TRANSFER)
-            {
-                menu_slot--;
-            }
+            button_vector.at(curr_position).set_highlight(false);
+            curr_position = get_pos_from_xy(curr_x, curr_y);
+            button_vector.at(curr_position).set_highlight(true);
         }
-
-        if (key_hit(KEY_A))
-        {
-            if ((get_tutorial_flag() == true || menu_slot == BTN_TRANSFER))
-            {
-                ani_mode = ENTERING;
-            }
-            else
-            {
-                // "Bad" noise here
-            }
-        }
-
-        if (menu_slot != old_menu_slot)
-        {
-            wide_button_array[menu_slot].set_highlight(true);
-            wide_button_array[old_menu_slot].set_highlight(false);
-            old_menu_slot = menu_slot;
-        }
-        return 0;
-    }
-    };
-    if (ani_mode == DISABLE)
-    {
-        return menu_slot;
+        global_next_frame();
     }
     return 0;
 }
 
-void main_menu_enter()
+void Button_Menu::add_button(Button btn, int return_val)
 {
-    ani_mode = ENTERING;
+    button_vector.push_back(btn);
+    return_values.push_back(return_val);
 }
 
-void main_menu_exit()
+void Button_Menu::show_buttons()
 {
-    ani_mode = EXITING;
-}
-
-void show_lang_btns()
-{
-    for (int i = 0; i < LANG_BUTTON_ARRAY_SIZE; i++)
+    for (unsigned int i = 0; i < button_vector.size(); i++)
     {
-        lang_button_array[i].show();
+        button_vector.at(i).show();
     }
 }
 
-void hide_lang_btns()
+void Button_Menu::hide_buttons()
 {
-    for (int i = 0; i < LANG_BUTTON_ARRAY_SIZE; i++)
+    for (Button &curr_btn : button_vector)
     {
-        lang_button_array[i].hide();
+        curr_btn.hide();
     }
 }
 
-void show_main_btns()
+void Button_Menu::organize_buttons()
 {
-    for (int i = 0; i < WIDE_BUTTON_ARRAY_SIZE; i++)
+    // Total space, minus the space taken up by the buttons, divided by the spaces between the buttons.
+    int vertical_space =
+        ((y_max - y_min) - ((button_vector.size() / columns) * button_height)) / ((button_vector.size() / columns) + 1);
+    int horizonal_space =
+        ((x_max - x_min) - ((button_vector.size() / rows) * button_width)) / ((button_vector.size() / rows) + 1);
+
+    for (unsigned int i = 0; i < button_vector.size(); i++)
     {
-        wide_button_array[i].show();
+        button_vector.at(i).set_location(
+            ((horizonal_space + button_width) * get_x_from_pos(i)) + horizonal_space + x_min,
+            ((vertical_space + button_height) * get_y_from_pos(i)) + vertical_space + y_min);
     }
 }
 
-void hide_main_btns()
+unsigned int Button_Menu::get_pos_from_xy(int nX, int nY)
 {
-    for (int i = 0; i < WIDE_BUTTON_ARRAY_SIZE; i++)
-    {
-        wide_button_array[i].hide();
-    }
+    return (nY * columns) + nX;
 }
 
-void highlight_lang_btn(int index, bool highlight)
+unsigned int Button_Menu::get_x_from_pos(int nPos)
 {
-    lang_button_array[index].set_highlight(highlight);
+    return (nPos % columns);
 }
 
-void set_arrow_point(int index)
+unsigned int Button_Menu::get_y_from_pos(int nPos)
 {
-    lang_button_array[LANG_ARROW].set_location(lang_button_array[index].x + 16, lang_button_array[index].y - 8);
+    return (nPos / columns);
 }
\ No newline at end of file
diff --git a/source/pokedex.cpp b/source/pokedex.cpp
index 22fdd10..9625d41 100644
--- a/source/pokedex.cpp
+++ b/source/pokedex.cpp
@@ -21,76 +21,89 @@ void pokedex_init()
 {
     for (int i = 0; i < DEX_MAX; i++)
     {
-        dex_array[i] = Dex(dex_l[i], dex_m[i], dex_r[i], 320, 352, 384);
+        dex_array[i] = Dex(dex_sprites[DEX_SPRITE_LEFT][i], dex_sprites[DEX_SPRITE_MID][i], dex_sprites[DEX_SPRITE_RIGHT][i]);
         dex_array[i].set_location(dex_x_cord, (i * (8 * 3)) + 8);
     }
 }
 
 int pokedex_loop()
 {
-    if (key_hit(KEY_DOWN) || key_hit(KEY_UP))
+    pokedex_show();
+    while (true)
     {
-        dex_shift += key_tri_vert();
-    }
-    else if (key_held(KEY_DOWN) || key_held(KEY_UP))
-    {
-        if (delay > SPEED_DELAY)
+        if (key_hit(KEY_B)){
+            pokedex_hide();
+            return 0;
+        }
+        else if (key_hit(KEY_DOWN) || key_hit(KEY_UP))
         {
-            if ((get_frame_count() % speed == 0))
+            dex_shift += key_tri_vert();
+        }
+        else if (key_held(KEY_DOWN) || key_held(KEY_UP))
+        {
+            if (delay > SPEED_DELAY)
             {
-                if (count > 3 && speed >= 5)
+                if ((get_frame_count() % speed == 0))
                 {
-                    speed = speed / 2;
-                    count = 0;
+                    if (count > 3 && speed >= 5)
+                    {
+                        speed = speed / 2;
+                        count = 0;
+                    }
+                    else
+                    {
+                        count++;
+                    }
+                    dex_shift += key_tri_vert();
                 }
-                else
-                {
-                    count++;
-                }
-                dex_shift += key_tri_vert();
+            }
+            else
+            {
+                delay++;
             }
         }
         else
         {
-            delay++;
+            speed = 20;
+            delay = 0;
+            count = 0;
         }
-    }
-    else
-    {
-        speed = 20;
-        delay = 0;
-        count = 0;
-    }
 
-    if (dex_shift > DEX_SHIFT_MAX)
-    {
-        dex_shift = DEX_SHIFT_MAX;
-    }
-    else if (dex_shift < 0)
-    {
-        dex_shift = 0;
-    }
-
-    tte_erase_rect(0, 0, 240, 160);
-    for (int i = 0; i < DEX_MAX; i++)
-    {
-        tte_set_pos(dex_x_cord + (1 * 8), (i * 8 * 3) + 16);
-        tte_write(is_caught(dex_shift + i + 1) ? "^" : " ");
-        tte_set_pos(dex_x_cord + (3 * 8), (i * 8 * 3) + 16);
-        tte_write(is_caught(dex_shift + i + 1) ? std::string(NAMES[dex_shift + i + 1]).data() : "----------");
-        tte_set_pos(dex_x_cord + (14 * 8), (i * 8 * 3) + 16);
-        tte_write("000");
-        if(dex_shift + i + 1 < 10){
-            leading_zeros = 2;
-        } else if (dex_shift + i + 1 < 100){
-            leading_zeros = 1;
-        } else {
-            leading_zeros = 0;
+        if (dex_shift > DEX_SHIFT_MAX)
+        {
+            dex_shift = DEX_SHIFT_MAX;
         }
-        tte_set_pos(dex_x_cord + ((14 + leading_zeros) * 8), (i * 8 * 3) + 16);
-        tte_write(std::to_string(dex_shift + i + 1).c_str());
+        else if (dex_shift < 0)
+        {
+            dex_shift = 0;
+        }
+
+        tte_erase_rect(0, 0, 240, 160);
+        for (int i = 0; i < DEX_MAX; i++)
+        {
+            tte_set_pos(dex_x_cord + (1 * 8), (i * 8 * 3) + 16);
+            tte_write(is_caught(dex_shift + i + 1) ? "^" : " ");
+            tte_set_pos(dex_x_cord + (3 * 8), (i * 8 * 3) + 16);
+            tte_write(is_caught(dex_shift + i + 1) ? std::string(NAMES[dex_shift + i + 1]).data() : "----------");
+            tte_set_pos(dex_x_cord + (14 * 8), (i * 8 * 3) + 16);
+            tte_write("000");
+            if (dex_shift + i + 1 < 10)
+            {
+                leading_zeros = 2;
+            }
+            else if (dex_shift + i + 1 < 100)
+            {
+                leading_zeros = 1;
+            }
+            else
+            {
+                leading_zeros = 0;
+            }
+            tte_set_pos(dex_x_cord + ((14 + leading_zeros) * 8), (i * 8 * 3) + 16);
+            tte_write(std::to_string(dex_shift + i + 1).c_str());
+        }
+        global_next_frame();
     }
-    return 0;
 }
 
 void pokedex_show()
diff --git a/source/script_array.cpp b/source/script_array.cpp
index 23df67e..1f4b76f 100644
--- a/source/script_array.cpp
+++ b/source/script_array.cpp
@@ -6,11 +6,15 @@
 #include "flash_mem.h"
 #include "pokemon_data.h"
 #include "mystery_gift_builder.h"
+#include "global_frame_controller.h"
 #include <tonc.h>
 
 int last_error;
 Pokemon_Party party_data = Pokemon_Party();
 
+Button_Menu lang_select(2, 3, 40, 24);
+Button_Menu game_select(2, 3, 40, 24);
+
 script_obj script[SCRIPT_SIZE];
 std::string_view dialogue[DIA_SIZE];
 
@@ -20,7 +24,7 @@ void populate_dialogue()
     dialogue[DIA_E4] = "Hi trainer! I'm thrilled\nyou've decided to help with our research, but we need\nthe best of the best!|Come back after you've\nbeaten the Elite Four and\nbecome the Champion!";
     dialogue[DIA_MG_FRLGE] = "Sorry trainer, one more\nthing to take care of before\nwe can begin- you need to\nenable MYSTERY GIFT!|Head to the nearest Pok@\nMart and fill out the\nquestionnaire as follows:\nLINK TOGETHER WITH ALL|After that, you should be\nall set to go!|See you soon!";
     dialogue[DIA_MG_RS] = "Sorry trainer, one more\nthing to take care of before\nwe can begin- you need to\nenable MYSTERY EVENT!|Head to the PETALBURG\nPok@mon Center and tell the\nman next to the PC:\nMYSTERY EVENT IS EXCITING|After that, you should be\nall set to go!|See you soon!";
-    dialogue[DIA_LETS_START] = "Let's get started!";
+    dialogue[DIA_LETS_START] = "Perfect, that's all the\ninformation I need! Let's\nget started!";
     dialogue[DIA_START] = "On a second Game Boy family\nsystem, please load the Game\nBoy Pok@mon game you wish to\ntransfer from.|In your Game Boy Pok@mon\ngame, put any Pok@mon you\nwant to bring out of\nyour dreams into your party.|Then connect this Game Boy\nAdvance to the other Game\nBoy family system using a\nGame Boy Color link cable.|Once you're ready, press A\non this device, talk to the Cable Club attendant, and\nthen initiate a trade.";
     dialogue[DIA_TRANS_GOOD] = "Amazing! Fantastic!\nEverything went perfectly!|You may now turn off your\nother Game Boy family\nsystem.";
     dialogue[DIA_NEW_DEX] = "It looks like there's at\nleast one new Pok@mon here\nthat isn't in the Dream Dex!|I'll give them something\nextra sweet as a reward for you both.";
@@ -32,6 +36,9 @@ void populate_dialogue()
     dialogue[DIA_MG_OTHER_EVENT] = "Hi Trainer! It looks like\nyou have a different event\ncurrently loaded.|That's no problem, but it\nwill be overwritten if you\ncontinue.|Turn off the system now if\nyou want to experience your\ncurrent event,\nbut otherwise-";
     dialogue[DIA_PKMN_TO_COLLECT] = "Hi Trainer! It looks like\nyou still have Pok@mon to\npick up...|I can send in new ones, but do know that the Pok@mon you\nhaven't picked up yet will\nbe replaced.|Turn off the system now if\nyou want to recieve those\nPok@mon, but otherwise-";
     dialogue[DIA_NO_VALID_PKMN] = "Sorry Trainer, it doesn't\nlook like you have any valid\nPok@mon in your party right\nnow.|Double check your party and we'll give it another shot!";
+    dialogue[DIA_ASK_QUEST] = "Hi trainer! Before we begin,\nI need to ask you a few\nquestions.";
+    dialogue[DIA_WHAT_GAME] = "First, which Game Boy\nPok@mon game are you\ntransfering from?";
+    dialogue[DIA_WHAT_LANG] = "What language is the Game\nBoy Pok@mon game that you're\ntransfering from?";
 
     dialogue[DIA_ERROR_COLOSSEUM] = "It looks like you went to\nthe colosseum instead of the\ntrading room!|Let's try that again!";
     dialogue[DIA_ERROR_COM_ENDED] = "Communication with the other\ndevice was terminated.|Let's try that again!";
@@ -54,12 +61,21 @@ void populate_script()
     script[DIA_OPEN] = script_obj(dialogue[DIA_OPEN], CMD_SET_TUTOR_TRUE);
     script[CMD_SET_TUTOR_TRUE] = script_obj(CMD_SET_TUTOR_TRUE, CMD_END_SCRIPT);
     script[COND_MG_OTHER_EVENT] = script_obj(COND_MG_OTHER_EVENT, DIA_MG_OTHER_EVENT, COND_PKMN_TO_COLLECT);
-    script[COND_PKMN_TO_COLLECT] = script_obj(COND_PKMN_TO_COLLECT, DIA_PKMN_TO_COLLECT, DIA_LETS_START);
-    script[DIA_MG_OTHER_EVENT] = script_obj(dialogue[DIA_MG_OTHER_EVENT], DIA_LETS_START);
-    script[DIA_PKMN_TO_COLLECT] = script_obj(dialogue[DIA_PKMN_TO_COLLECT], DIA_LETS_START);
+    script[COND_PKMN_TO_COLLECT] = script_obj(COND_PKMN_TO_COLLECT, DIA_PKMN_TO_COLLECT, DIA_ASK_QUEST);
+    script[DIA_MG_OTHER_EVENT] = script_obj(dialogue[DIA_MG_OTHER_EVENT], DIA_ASK_QUEST);
+    script[DIA_PKMN_TO_COLLECT] = script_obj(dialogue[DIA_PKMN_TO_COLLECT], DIA_ASK_QUEST);
+
+    // Ask the user what game and language they're using
     script[DIA_LETS_START] = script_obj(dialogue[DIA_LETS_START], DIA_START);
     script[DIA_START] = script_obj(dialogue[DIA_START], CMD_START_LINK);
     script[CMD_START_LINK] = script_obj(CMD_START_LINK, COND_ERROR_TIMEOUT_ONE);
+    script[DIA_WHAT_GAME] = script_obj(dialogue[DIA_WHAT_GAME], CMD_GAME_MENU);
+    script[CMD_GAME_MENU] = script_obj(CMD_GAME_MENU, DIA_WHAT_LANG);
+    script[DIA_WHAT_LANG] = script_obj(dialogue[DIA_WHAT_LANG], CMD_LANG_MENU);
+    script[CMD_LANG_MENU] = script_obj(CMD_LANG_MENU, CMD_SLIDE_PROF_RIGHT);
+    script[DIA_ASK_QUEST] = script_obj(dialogue[DIA_ASK_QUEST], CMD_SLIDE_PROF_LEFT);
+    script[CMD_SLIDE_PROF_LEFT] = script_obj(CMD_SLIDE_PROF_LEFT, DIA_WHAT_GAME);
+    script[CMD_SLIDE_PROF_RIGHT] = script_obj(CMD_SLIDE_PROF_RIGHT, DIA_LETS_START);
 
     // Initiate the transfer and check for errors
     script[COND_ERROR_TIMEOUT_ONE] = script_obj(COND_ERROR_TIMEOUT_ONE, COND_ERROR_TIMEOUT_TWO, DIA_ERROR_TIME_ONE);
@@ -86,11 +102,29 @@ void populate_script()
     script[DIA_THANK] = script_obj(dialogue[DIA_THANK], CMD_END_SCRIPT);
 
     // Hide the dialouge and professor
-    script[CMD_END_SCRIPT] = script_obj(CMD_END_SCRIPT, CMD_HIDE_PROF);
-    script[CMD_HIDE_PROF] = script_obj(CMD_HIDE_PROF, CMD_BACK_TO_MENU);
+    script[CMD_END_SCRIPT] = script_obj(CMD_END_SCRIPT, CMD_BACK_TO_MENU);
     script[CMD_BACK_TO_MENU] = script_obj(CMD_BACK_TO_MENU, SCRIPT_START);
 };
 
+void populate_buttons()
+{
+    lang_select.set_xy_min_max(48, 240, 0, 120);
+    lang_select.add_button(Button(btn_lang_eng), BTN_ENG);
+    lang_select.add_button(Button(btn_lang_fre), BTN_FRE);
+    lang_select.add_button(Button(btn_lang_ita), BTN_ITA);
+    lang_select.add_button(Button(btn_lang_ger), BTN_GER);
+    lang_select.add_button(Button(btn_lang_spa), BTN_SPA);
+    lang_select.add_button(Button(btn_lang_kor), BTN_KOR);
+
+    game_select.set_xy_min_max(48, 240, 0, 120);
+    game_select.add_button(Button(btn_lang_eng), BTN_ENG);
+    game_select.add_button(Button(btn_lang_fre), BTN_FRE);
+    game_select.add_button(Button(btn_lang_ita), BTN_ITA);
+    game_select.add_button(Button(btn_lang_ger), BTN_GER);
+    game_select.add_button(Button(btn_lang_spa), BTN_SPA);
+    game_select.add_button(Button(btn_lang_kor), BTN_KOR);
+}
+
 bool run_conditional(int index)
 {
     // Here is most of the logic that drives what lines show up where. It's probably not the best way to code it, but it works
@@ -147,12 +181,13 @@ bool run_conditional(int index)
         return inject_mystery(party_data);
 
     case CMD_BACK_TO_MENU:
-        text_disable();
-        main_menu_exit();
+        set_text_exit();
+        obj_hide(prof);
         return true;
 
     case CMD_SHOW_PROF:
         obj_unhide(prof, 0);
+        obj_set_pos(prof, 96, 56);
         return true;
 
     case CMD_HIDE_PROF:
@@ -166,12 +201,28 @@ bool run_conditional(int index)
     case CMD_END_SCRIPT:
         return true;
 
-    case CMD_ASK_LANG:
-        //party_data.set_lang();
+    case CMD_LANG_MENU:
+        party_data.set_lang(lang_select.button_main());
         return true;
 
-    case CMD_ASK_GAME:
-        //party_data.set_game();
+    case CMD_GAME_MENU:
+        party_data.set_game(game_select.button_main());
+        return true;
+
+    case CMD_SLIDE_PROF_LEFT:
+        for (int i = 0; i < 48; i++)
+        {
+            obj_set_pos(prof, (prof->attr1 & ATTR1_X_MASK) - 2, prof->attr0 & ATTR0_Y_MASK);
+            global_next_frame();
+        }
+        return true;
+
+    case CMD_SLIDE_PROF_RIGHT:
+        for (int i = 0; i < 48; i++)
+        {
+            obj_set_pos(prof, (prof->attr1 & ATTR1_X_MASK) + 2, prof->attr0 & ATTR0_Y_MASK);
+            global_next_frame();
+        }
         return true;
 
     default:
diff --git a/source/sprite_data.cpp b/source/sprite_data.cpp
index 10225a2..57706d3 100644
--- a/source/sprite_data.cpp
+++ b/source/sprite_data.cpp
@@ -4,6 +4,8 @@
 #include <cstring>
 #include "sprite_data.h"
 
+#define SPRITE_CHAR_BLOCK 4
+
 OBJ_ATTR obj_buffer[128];
 OBJ_AFFINE *obj_aff_buffer = (OBJ_AFFINE *)obj_buffer;
 
@@ -58,425 +60,73 @@ void load_textbox_background()
 
 // SPRITES
 
-#include "metr.h"
-OBJ_ATTR *testroid = &obj_buffer[0];
-void load_testroid()
+int num_sprites = 0;
+OBJ_ATTR *testroid = &obj_buffer[num_sprites++];
+OBJ_ATTR *prof = &obj_buffer[num_sprites++];
+OBJ_ATTR *btn_t_l = &obj_buffer[num_sprites++];
+OBJ_ATTR *btn_t_r = &obj_buffer[num_sprites++];
+OBJ_ATTR *btn_p_l = &obj_buffer[num_sprites++];
+OBJ_ATTR *btn_p_r = &obj_buffer[num_sprites++];
+OBJ_ATTR *btn_c_l = &obj_buffer[num_sprites++];
+OBJ_ATTR *btn_c_r = &obj_buffer[num_sprites++];
+OBJ_ATTR *btn_d_l = &obj_buffer[num_sprites++];
+OBJ_ATTR *btn_d_r = &obj_buffer[num_sprites++];
+
+OBJ_ATTR *dex_sprites[3][6] = { // Fills the dex sprites top to bottom, left to right
+    {&obj_buffer[num_sprites++], &obj_buffer[num_sprites++], &obj_buffer[num_sprites++],
+     &obj_buffer[num_sprites++], &obj_buffer[num_sprites++], &obj_buffer[num_sprites++]},
+    {&obj_buffer[num_sprites++], &obj_buffer[num_sprites++], &obj_buffer[num_sprites++],
+     &obj_buffer[num_sprites++], &obj_buffer[num_sprites++], &obj_buffer[num_sprites++]},
+    {&obj_buffer[num_sprites++], &obj_buffer[num_sprites++], &obj_buffer[num_sprites++],
+     &obj_buffer[num_sprites++], &obj_buffer[num_sprites++], &obj_buffer[num_sprites++]}};
+
+OBJ_ATTR *btn_lang_eng = &obj_buffer[num_sprites++];
+OBJ_ATTR *btn_lang_fre = &obj_buffer[num_sprites++];
+OBJ_ATTR *btn_lang_ita = &obj_buffer[num_sprites++];
+OBJ_ATTR *btn_lang_ger = &obj_buffer[num_sprites++];
+OBJ_ATTR *btn_lang_spa = &obj_buffer[num_sprites++];
+OBJ_ATTR *btn_lang_kor = &obj_buffer[num_sprites++];
+OBJ_ATTR *lang_arrow = &obj_buffer[num_sprites++];
+
+void load_sprites()
 {
+    memcpy(pal_obj_mem + (METR_PAL * 16), metrPal, metrPalLen);
+    memcpy(pal_obj_mem + (PROF_PAL * 16), profPal, profPalLen);
+    memcpy(pal_obj_mem + (BTN_PAL * 16), btn_t_lPal, btn_t_lPalLen);
+    memcpy(pal_obj_mem + (BTN_LIT_PAL * 16), btn_t_rPal, btn_t_rPalLen);
 
-    memcpy(&tile_mem[4][0], metrTiles, metrTilesLen);
-    memcpy(pal_obj_mem, metrPal, metrPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 0, pb = 0; // tile id, pal-bank
-
-    obj_set_attr(testroid,
-                 ATTR0_SQUARE,
-                 ATTR1_SIZE_64x64,
-                 ATTR2_PALBANK(pb) | tid);
-
-    obj_set_pos(testroid, x, y);
-    obj_hide(testroid);
-    // obj_unhide(testroid, 0);
-}
-
-#include "prof.h"
-OBJ_ATTR *prof = &obj_buffer[1];
-void load_professor()
-{
-    memcpy(&tile_mem[4][64], profTiles, profTilesLen);
-    memcpy(pal_obj_mem + 16, profPal, profPalLen);
-
-    int x = 96, y = 56;
-    u32 tid = 64, pb = 1; // tile id, pal-bank
-
-    obj_set_attr(prof,
-                 ATTR0_SQUARE,
-                 ATTR1_SIZE_64x64,
-                 ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(2));
-    obj_set_pos(prof, x, y);
-    obj_hide(prof);
-    //obj_unhide(prof, 0);
-}
-
-#include "btn_t_l.h"
-OBJ_ATTR *btn_t_l = &obj_buffer[2];
-void load_btn_t_l()
-{
-    memcpy(&tile_mem[4][128], btn_t_lTiles, btn_t_lTilesLen);
-    memcpy(pal_obj_mem + 32, btn_t_lPal, btn_t_lPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 128, pb = 2; // tile id, pal-bank
-
-    obj_set_attr(btn_t_l,
-                 ATTR0_WIDE,
-                 ATTR1_SIZE_64x32,
-                 ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(1));
-    obj_set_pos(btn_t_l, x, y);
-    obj_hide(btn_t_l);
-    // obj_unhide(btn_t_l, 0);
-}
-
-#include "btn_t_r.h"
-OBJ_ATTR *btn_t_r = &obj_buffer[3];
-void load_btn_t_r()
-{
-    memcpy(&tile_mem[4][160], btn_t_rTiles, btn_t_rTilesLen);
-    memcpy(pal_obj_mem + 48, btn_t_rPal, btn_t_rPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 160, pb = 2; // tile id, pal-bank
-
-    obj_set_attr(btn_t_r,
-                 ATTR0_WIDE,
-                 ATTR1_SIZE_64x32,
-                 ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(1));
-
-    obj_set_pos(btn_t_r, x, y);
-    obj_hide(btn_t_r);
-    // obj_unhide(btn_t_r, 0);
-}
-
-#include "btn_p_l.h"
-OBJ_ATTR *btn_p_l = &obj_buffer[4];
-void load_btn_p_l()
-{
-    memcpy(&tile_mem[4][192], btn_p_lTiles, btn_p_lTilesLen);
-    // memcpy(pal_obj_mem + 32, btn_p_lPal, btn_p_lPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 192, pb = 2; // tile id, pal-bank
-
-    obj_set_attr(btn_p_l,
-                 ATTR0_WIDE,
-                 ATTR1_SIZE_64x32,
-                 ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(1));
-    obj_set_pos(btn_p_l, x, y);
-    obj_hide(btn_p_l);
-    // obj_unhide(btn_p_l, 0);
-}
-
-#include "btn_p_r.h"
-OBJ_ATTR *btn_p_r = &obj_buffer[5];
-void load_btn_p_r()
-{
-    memcpy(&tile_mem[4][224], btn_p_rTiles, btn_p_rTilesLen);
-    // memcpy(pal_obj_mem + 48, btn_p_rPal, btn_p_rPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 224, pb = 2; // tile id, pal-bank
-
-    obj_set_attr(btn_p_r,
-                 ATTR0_WIDE,
-                 ATTR1_SIZE_64x32,
-                 ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(1));
-
-    obj_set_pos(btn_p_r, x, y);
-    obj_hide(btn_p_r);
-    // obj_unhide(btn_p_r, 0);
-}
-
-#include "btn_c_l.h"
-OBJ_ATTR *btn_c_l = &obj_buffer[6];
-void load_btn_c_l()
-{
-    memcpy(&tile_mem[4][256], btn_c_lTiles, btn_c_lTilesLen);
-    // memcpy(pal_obj_mem + 32, btn_c_lPal, btn_c_lPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 256, pb = 2; // tile id, pal-bank
-
-    obj_set_attr(btn_c_l,
-                 ATTR0_WIDE,
-                 ATTR1_SIZE_64x32,
-                 ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(1));
-    obj_set_pos(btn_c_l, x, y);
-    obj_hide(btn_c_l);
-    // obj_unhide(btn_c_l, 0);
-}
-
-#include "btn_c_r.h"
-OBJ_ATTR *btn_c_r = &obj_buffer[7];
-void load_btn_c_r()
-{
-    memcpy(&tile_mem[4][288], btn_c_rTiles, btn_c_rTilesLen);
-    // memcpy(pal_obj_mem + 48, btn_c_rPal, btn_c_rPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 288, pb = 2; // tile id, pal-bank
-
-    obj_set_attr(btn_c_r,
-                 ATTR0_WIDE,
-                 ATTR1_SIZE_64x32,
-                 ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(1));
-
-    obj_set_pos(btn_c_r, x, y);
-    obj_hide(btn_c_r);
-    // obj_unhide(btn_c_r, 0);
-}
-
-#include "dex_l.h"
-OBJ_ATTR *dex_l[6] = {
-    &obj_buffer[8],
-    &obj_buffer[11],
-    &obj_buffer[14],
-    &obj_buffer[17],
-    &obj_buffer[20],
-    &obj_buffer[23]};
-
-void load_dex_l()
-{
-    memcpy(&tile_mem[4][320], dex_lTiles, dex_lTilesLen);
-    // memcpy(pal_obj_mem + 48, dex_lPal, dex_lPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 320, pb = 2; // tile id, pal-bank
-
-    for (int i = 0; i < 6; i++)
+    u32 curr_tile_id = 0;
+    load_sprite(testroid, metrTiles, metrTilesLen, curr_tile_id, METR_PAL, ATTR0_SQUARE, ATTR1_SIZE_64x64, 0);
+    load_sprite(prof, profTiles, profTilesLen, curr_tile_id, PROF_PAL, ATTR0_SQUARE, ATTR1_SIZE_64x64, 2);
+    load_sprite(btn_t_l, btn_t_lTiles, btn_t_lTilesLen, curr_tile_id, BTN_PAL, ATTR0_WIDE, ATTR1_SIZE_64x32, 1);
+    load_sprite(btn_t_r, btn_t_rTiles, btn_t_rTilesLen, curr_tile_id, BTN_PAL, ATTR0_WIDE, ATTR1_SIZE_64x32, 1);
+    load_sprite(btn_p_l, btn_p_lTiles, btn_p_lTilesLen, curr_tile_id, BTN_PAL, ATTR0_WIDE, ATTR1_SIZE_64x32, 1);
+    load_sprite(btn_p_r, btn_p_rTiles, btn_p_rTilesLen, curr_tile_id, BTN_PAL, ATTR0_WIDE, ATTR1_SIZE_64x32, 1);
+    load_sprite(btn_c_l, btn_c_lTiles, btn_c_lTilesLen, curr_tile_id, BTN_PAL, ATTR0_WIDE, ATTR1_SIZE_64x32, 1);
+    load_sprite(btn_c_r, btn_c_rTiles, btn_c_rTilesLen, curr_tile_id, BTN_PAL, ATTR0_WIDE, ATTR1_SIZE_64x32, 1);
+    load_sprite(btn_d_l, btn_d_lTiles, btn_d_lTilesLen, curr_tile_id, BTN_PAL, ATTR0_WIDE, ATTR1_SIZE_64x32, 1);
+    load_sprite(btn_d_r, btn_d_rTiles, btn_d_rTilesLen, curr_tile_id, BTN_PAL, ATTR0_WIDE, ATTR1_SIZE_64x32, 1);
+    for (int col = 0; col < 6; col++)
     {
-        obj_set_attr(dex_l[i],
-                     ATTR0_WIDE,
-                     ATTR1_SIZE_64x32,
-                     ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(2));
-
-        obj_set_pos(dex_l[i], x, y);
-        obj_hide(dex_l[i]);
-        // obj_unhide(dex_l, 0);
+        load_sprite(dex_sprites[DEX_SPRITE_LEFT][col], dex_lTiles, dex_lTilesLen, curr_tile_id, BTN_PAL, ATTR0_WIDE, ATTR1_SIZE_64x32, 2);
+        load_sprite(dex_sprites[DEX_SPRITE_MID][col], dex_mTiles, dex_mTilesLen, curr_tile_id, BTN_PAL, ATTR0_WIDE, ATTR1_SIZE_64x32, 2);
+        load_sprite(dex_sprites[DEX_SPRITE_RIGHT][col], dex_rTiles, dex_rTilesLen, curr_tile_id, BTN_PAL, ATTR0_TALL, ATTR1_SIZE_16x32, 2);
     }
+
+    load_sprite(btn_lang_eng, btn_lang_engTiles, btn_lang_engTilesLen, curr_tile_id, BTN_PAL, ATTR0_WIDE, ATTR1_SIZE_64x32, 1);
+    load_sprite(btn_lang_fre, btn_lang_freTiles, btn_lang_freTilesLen, curr_tile_id, BTN_PAL, ATTR0_WIDE, ATTR1_SIZE_64x32, 1);
+    load_sprite(btn_lang_ita, btn_lang_itaTiles, btn_lang_itaTilesLen, curr_tile_id, BTN_PAL, ATTR0_WIDE, ATTR1_SIZE_64x32, 1);
+    load_sprite(btn_lang_ger, btn_lang_gerTiles, btn_lang_gerTilesLen, curr_tile_id, BTN_PAL, ATTR0_WIDE, ATTR1_SIZE_64x32, 1);
+    load_sprite(btn_lang_spa, btn_lang_spaTiles, btn_lang_spaTilesLen, curr_tile_id, BTN_PAL, ATTR0_WIDE, ATTR1_SIZE_64x32, 1);
+    load_sprite(btn_lang_kor, btn_lang_korTiles, btn_lang_korTilesLen, curr_tile_id, BTN_PAL, ATTR0_WIDE, ATTR1_SIZE_64x32, 1);
+    load_sprite(lang_arrow, lang_arrowTiles, lang_arrowTilesLen, curr_tile_id, BTN_PAL, ATTR0_SQUARE, ATTR1_SIZE_8x8, 1);
 }
 
-#include "dex_m.h"
-OBJ_ATTR *dex_m[6] = {
-    &obj_buffer[9],
-    &obj_buffer[12],
-    &obj_buffer[15],
-    &obj_buffer[18],
-    &obj_buffer[21],
-    &obj_buffer[24]};
-void load_dex_m()
+void load_sprite(OBJ_ATTR *sprite, const unsigned int objTiles[], int objTilesLen,
+                 u32 &tile_id, u32 pal_bank, int attr0, int attr1, u32 priority)
 {
-    memcpy(&tile_mem[4][352], dex_mTiles, dex_mTilesLen);
-    // memcpy(pal_obj_mem + 48, dex_mPal, dex_mPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 352, pb = 2; // tile id, pal-bank
-    for (int i = 0; i < 6; i++)
-    {
-        obj_set_attr(dex_m[i],
-                     ATTR0_WIDE,
-                     ATTR1_SIZE_64x32,
-                     ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(2));
-
-        obj_set_pos(dex_m[i], x, y);
-        obj_hide(dex_m[i]);
-        // obj_unhide(dex_m, 0);
-    }
-}
-
-#include "dex_r.h"
-OBJ_ATTR *dex_r[6] = {
-    &obj_buffer[10],
-    &obj_buffer[13],
-    &obj_buffer[16],
-    &obj_buffer[19],
-    &obj_buffer[22],
-    &obj_buffer[25]};
-void load_dex_r()
-{
-    memcpy(&tile_mem[4][384], dex_rTiles, dex_rTilesLen);
-    // memcpy(pal_obj_mem + 48, dex_rPal, dex_rPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 384, pb = 2; // tile id, pal-bank
-    for (int i = 0; i < 6; i++)
-    {
-        obj_set_attr(dex_r[i],
-                     ATTR0_TALL,
-                     ATTR1_SIZE_16x32,
-                     ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(2));
-
-        obj_set_pos(dex_r[i], x, y);
-        obj_hide(dex_r[i]);
-        // obj_unhide(dex_r, 0);
-    }
-}
-
-#include "btn_d_l.h"
-OBJ_ATTR *btn_d_l = &obj_buffer[26];
-void load_btn_d_l()
-{
-    memcpy(&tile_mem[4][416], btn_d_lTiles, btn_d_lTilesLen);
-    memcpy(pal_obj_mem + 32, btn_d_lPal, btn_d_lPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 416, pb = 2; // tile id, pal-bank
-
-    obj_set_attr(btn_d_l,
-                 ATTR0_WIDE,
-                 ATTR1_SIZE_64x32,
-                 ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(1));
-    obj_set_pos(btn_d_l, x, y);
-    obj_hide(btn_d_l);
-    // obj_unhide(btn_d_l, 0);
-}
-
-#include "btn_d_r.h"
-OBJ_ATTR *btn_d_r = &obj_buffer[27];
-void load_btn_d_r()
-{
-    memcpy(&tile_mem[4][448], btn_d_rTiles, btn_d_rTilesLen);
-    //memcpy(pal_obj_mem + 48, btn_d_rPal, btn_d_rPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 448, pb = 2; // tile id, pal-bank
-
-    obj_set_attr(btn_d_r,
-                 ATTR0_WIDE,
-                 ATTR1_SIZE_64x32,
-                 ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(1));
-
-    obj_set_pos(btn_d_r, x, y);
-    obj_hide(btn_d_r);
-    // obj_unhide(btn_d_r, 0);
-}
-
-#include "btn_lang_eng.h"
-OBJ_ATTR *btn_lang_eng = &obj_buffer[28];
-void load_btn_lang_eng()
-{
-    memcpy(&tile_mem[4][480], btn_lang_engTiles, btn_lang_engTilesLen);
-    //memcpy(pal_obj_mem + 48, btn_lang_engPal, btn_lang_engPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 480, pb = 2; // tile id, pal-bank
-
-    obj_set_attr(btn_lang_eng,
-                 ATTR0_WIDE,
-                 ATTR1_SIZE_64x32,
-                 ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(1));
-
-    obj_set_pos(btn_lang_eng, x, y);
-    obj_hide(btn_lang_eng);
-    // obj_unhide(btn_lang_eng, 0);
-}
-
-#include "btn_lang_fre.h"
-OBJ_ATTR *btn_lang_fre = &obj_buffer[29];
-void load_btn_lang_fre()
-{
-    memcpy(&tile_mem[4][512], btn_lang_freTiles, btn_lang_freTilesLen);
-    //memcpy(pal_obj_mem + 48, btn_lang_frePal, btn_lang_frePalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 512, pb = 2; // tile id, pal-bank
-
-    obj_set_attr(btn_lang_fre,
-                 ATTR0_WIDE,
-                 ATTR1_SIZE_64x32,
-                 ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(1));
-
-    obj_set_pos(btn_lang_fre, x, y);
-    obj_hide(btn_lang_fre);
-    // obj_unhide(btn_lang_fre, 0);
-}
-
-#include "btn_lang_ita.h"
-OBJ_ATTR *btn_lang_ita = &obj_buffer[30];
-void load_btn_lang_ita()
-{
-    memcpy(&tile_mem[4][544], btn_lang_itaTiles, btn_lang_itaTilesLen);
-    //memcpy(pal_obj_mem + 48, btn_lang_itaPal, btn_lang_itaPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 544, pb = 2; // tile id, pal-bank
-
-    obj_set_attr(btn_lang_ita,
-                 ATTR0_WIDE,
-                 ATTR1_SIZE_64x32,
-                 ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(1));
-
-    obj_set_pos(btn_lang_ita, x, y);
-    obj_hide(btn_lang_ita);
-    // obj_unhide(btn_lang_ita, 0);
-}
-
-#include "btn_lang_ger.h"
-OBJ_ATTR *btn_lang_ger = &obj_buffer[31];
-void load_btn_lang_ger()
-{
-    memcpy(&tile_mem[4][576], btn_lang_gerTiles, btn_lang_gerTilesLen);
-    //memcpy(pal_obj_mem + 48, btn_lang_gerPal, btn_lang_gerPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 576, pb = 2; // tile id, pal-bank
-
-    obj_set_attr(btn_lang_ger,
-                 ATTR0_WIDE,
-                 ATTR1_SIZE_64x32,
-                 ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(1));
-
-    obj_set_pos(btn_lang_ger, x, y);
-    obj_hide(btn_lang_ger);
-    // obj_unhide(btn_lang_ger, 0);
-}
-
-#include "btn_lang_spa.h"
-OBJ_ATTR *btn_lang_spa = &obj_buffer[32];
-void load_btn_lang_spa()
-{
-    memcpy(&tile_mem[4][608], btn_lang_spaTiles, btn_lang_spaTilesLen);
-    //memcpy(pal_obj_mem + 48, btn_lang_spaPal, btn_lang_spaPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 608, pb = 2; // tile id, pal-bank
-
-    obj_set_attr(btn_lang_spa,
-                 ATTR0_WIDE,
-                 ATTR1_SIZE_64x32,
-                 ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(1));
-
-    obj_set_pos(btn_lang_spa, x, y);
-    obj_hide(btn_lang_spa);
-    // obj_unhide(btn_lang_spa, 0);
-}
-
-#include "btn_lang_kor.h"
-OBJ_ATTR *btn_lang_kor = &obj_buffer[33];
-void load_btn_lang_kor()
-{
-    memcpy(&tile_mem[4][640], btn_lang_korTiles, btn_lang_korTilesLen);
-    //memcpy(pal_obj_mem + 48, btn_lang_korPal, btn_lang_korPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 640, pb = 2; // tile id, pal-bank
-
-    obj_set_attr(btn_lang_kor,
-                 ATTR0_WIDE,
-                 ATTR1_SIZE_64x32,
-                 ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(1));
-
-    obj_set_pos(btn_lang_kor, x, y);
-    obj_hide(btn_lang_kor);
-    // obj_unhide(btn_lang_kor, 0);
-}
-
-#include "lang_arrow.h"
-OBJ_ATTR *lang_arrow = &obj_buffer[34];
-void load_lang_arrow()
-{
-    memcpy(&tile_mem[4][672], lang_arrowTiles, lang_arrowTilesLen);
-    //memcpy(pal_obj_mem + 48, lang_arrowPal, lang_arrowPalLen);
-
-    int x = 0, y = 0;
-    u32 tid = 672, pb = 2; // tile id, pal-bank
-
-    obj_set_attr(lang_arrow,
-                 ATTR0_SQUARE,
-                 ATTR1_SIZE_8x8,
-                 ATTR2_PALBANK(pb) | tid | ATTR2_PRIO(1));
-
-    obj_set_pos(lang_arrow, x, y);
-    obj_hide(lang_arrow);
-    // obj_unhide(lang_arrow, 0);
-}
-
+    memcpy(&tile_mem[SPRITE_CHAR_BLOCK][tile_id], objTiles, objTilesLen);
+    obj_set_attr(sprite, attr0, attr1, ATTR2_PALBANK(pal_bank) | tile_id | ATTR2_PRIO(priority));
+    tile_id += objTilesLen / 32;
+    obj_hide(sprite);
+};
\ No newline at end of file
diff --git a/source/text_engine.cpp b/source/text_engine.cpp
index e95e035..cc0f2cc 100644
--- a/source/text_engine.cpp
+++ b/source/text_engine.cpp
@@ -3,7 +3,7 @@
 #include <cstring>
 
 #include "text_engine.h"
-#include "global_frame_counter.h"
+#include "global_frame_controller.h"
 #include "pkmn_font.h"
 #include "script_array.h"
 
@@ -14,7 +14,7 @@ script_obj curr_line;
 uint char_index;
 uint line_char_index;
 std::string curr_text;
-bool disabled;
+bool text_exit;
 
 void init_text_engine()
 {
@@ -26,25 +26,25 @@ void init_text_engine()
     pal_bg_bank[13][15] = CLR_WHITE;
     pal_bg_bank[14][15] = 0b0000001001111111;
     pal_bg_bank[15][15] = 0b0001100011100110;
-    
 
     // Set default variables
     curr_line = script[SCRIPT_START];
     char_index = 0;
     line_char_index = 0;
-    disabled = false;
     curr_text = curr_line.get_text();
+    text_exit = false;
 }
 
-void text_next_frame()
+int text_loop()
 {
-    if (!disabled)
+    show_text_box();
+    tte_set_margins(LEFT, TOP, RIGHT, BOTTOM);
+    while (true)
     {
-        tte_set_margins(LEFT, TOP, RIGHT, BOTTOM);
         tte_set_pos(LEFT, TOP);
         if (char_index < curr_text.length() && curr_text.substr(char_index, 1) != "|")
         {
-            if (get_frame_count() % 2 == 0 || key_held(KEY_B))
+            if (get_frame_count() % 2 == 0 || key_held(KEY_B) || key_held(KEY_A))
             {
                 char_index++;
                 tte_erase_rect(LEFT, TOP, RIGHT, BOTTOM);
@@ -53,24 +53,31 @@ void text_next_frame()
         }
         else
         {
-            if (key_hit(KEY_A) || curr_text.length() == 0)
+            if (key_hit(KEY_A) || key_hit(KEY_B) || curr_text.length() == 0)
             {
                 if (curr_text.substr(char_index, 1) == "|")
                 {
                     line_char_index += char_index;
                     line_char_index++;
                     curr_text = curr_line.get_text().substr(line_char_index);
-                    char_index = 0;
                 }
                 else
                 {
                     line_char_index = 0;
                     curr_line = script[text_next_obj_id(curr_line)];
                     curr_text = curr_line.get_text();
-                    char_index = 0;
                 }
+                char_index = 0;
             }
         }
+        if (text_exit)
+        {
+            hide_text_box();
+            tte_erase_rect(LEFT, TOP, RIGHT, BOTTOM);
+            text_exit = false;
+            return 0;
+        }
+        global_next_frame();
     }
 }
 
@@ -90,19 +97,6 @@ int text_next_obj_id(script_obj current_line)
     }
 }
 
-void text_enable()
-{
-    disabled = false;
-    show_text_box();
-}
-
-void text_disable()
-{
-    disabled = true;
-    tte_erase_screen();
-    hide_text_box();
-}
-
 void show_text_box()
 {
     REG_BG2CNT = (REG_BG2CNT & ~BG_PRIO_MASK) | BG_PRIO(1);
@@ -112,3 +106,8 @@ void hide_text_box()
 {
     REG_BG2CNT = (REG_BG2CNT & ~BG_PRIO_MASK) | BG_PRIO(3);
 }
+
+void set_text_exit()
+{
+    text_exit = true;
+}
\ No newline at end of file