Browse Source

refractor stuff

SBird1337 7 years ago
parent
commit
9f5b2b1e1e

+ 1
- 1
src/overworld/tileset_animation/text_animator.c View File

32
 }
32
 }
33
 
33
 
34
 void draw_text_on_canvas(const char *txt) {
34
 void draw_text_on_canvas(const char *txt) {
35
+    
35
     u16 current_tile = 0;
36
     u16 current_tile = 0;
36
     while (*txt) {
37
     while (*txt) {
37
         s16 tile = char_to_tile_index(*txt);
38
         s16 tile = char_to_tile_index(*txt);
91
     blockset_one_current_tile = 0;
92
     blockset_one_current_tile = 0;
92
     blockset_one_max_tile = 0x280;
93
     blockset_one_max_tile = 0x280;
93
     blockset_one_animator = text_animator;
94
     blockset_one_animator = text_animator;
94
-    dprintf("%d\n", var_8000);
95
     if(var_8000 != 0)
95
     if(var_8000 != 0)
96
         draw_text_on_canvas(map_texts[var_8000]);
96
         draw_text_on_canvas(map_texts[var_8000]);
97
 }
97
 }

+ 1
- 7
src/specials/custom_specials.c View File

81
 /* === STATICS === */
81
 /* === STATICS === */
82
 
82
 
83
 static special_func special_routines[10] = {
83
 static special_func special_routines[10] = {
84
-    met_play,         cam_sp_move_camera, sp_init_script,  NULL, sp_dns_switch,
84
+    met_play,         cam_sp_move_camera, sp_init_script,  NULL, NULL,
85
     sp_random_number, sp_check_tileset,   sp_batchmaptile, sp_crystal_fade, sp_set_rival,
85
     sp_random_number, sp_check_tileset,   sp_batchmaptile, sp_crystal_fade, sp_set_rival,
86
 };
86
 };
87
 
87
 
95
     }
95
     }
96
 }
96
 }
97
 
97
 
98
-void sp_dns_switch() {
99
-    volatile u8 *test_pointer = (u8 *)(0x0203FAB0);
100
-    *(test_pointer + 1) = (*(test_pointer + 1) == 3 ? 0 : (*(test_pointer + 1)) + 1);
101
-    *test_pointer = 1;
102
-}
103
-
104
 void sp_init_script() {
98
 void sp_init_script() {
105
     for (u16 i = 0x1000; i < 0x1800; ++i)
99
     for (u16 i = 0x1000; i < 0x1800; ++i)
106
         flag_clear(i);
100
         flag_clear(i);