diff --git a/tools/disasm.py b/tools/disasm.py index 9f8269907c..b6f0095523 100644 --- a/tools/disasm.py +++ b/tools/disasm.py @@ -714,6 +714,9 @@ class Disassembler: self.first_pass() # find functions and variables with open(path + "/undef.txt", 'w', newline='\n') as f: for addr in sorted(self.vars): + if addr < 0x02000000: + continue # Don't print out symbols of dmadata files' vrom addresses. These will be defined in another file. + is_in_bss, region = self.is_in_bss(addr) if is_in_bss: f.write("%s = %s_bss_start + 0x%08X;\n" % (self.make_load(addr), region[2], addr - region[0])) diff --git a/undef.txt b/undef.txt index aa62cc849d..040153f147 100644 --- a/undef.txt +++ b/undef.txt @@ -1,66 +1,3 @@ -dmadata_vrom_start = 0x0001A500; -dmadata_vrom_end = 0x00020700; -Audioseq_vrom_start = 0x00046AF0; -Audioseq_vrom_end = 0x00097F70; -link_animetion_vrom_start = 0x0065D000; -D_00957000 = 0x00957000; -D_009ECEC0 = 0x009ECEC0; -D_009ED000 = 0x009ED000; -D_009F4700 = 0x009F4700; -icon_item_field_static_vrom_start = 0x009F5000; -icon_item_field_static_vrom_end = 0x00A09AF0; -icon_item_dungeon_static_vrom_start = 0x00A0A000; -icon_item_dungeon_static_vrom_end = 0x00A0EB80; -icon_item_gameover_static_vrom_start = 0x00A0F000; -icon_item_gameover_static_vrom_end = 0x00A12300; -_013_0x00963540_vrom_start = 0x00A13000; -_013_0x00963540_vrom_end = 0x00A1BA00; -_014_0x00967260_vrom_start = 0x00A1C000; -_014_0x00967260_vrom_end = 0x00A1C2E0; -map_i_static_vrom_start = 0x00A1D000; -map_grand_static_vrom_start = 0x00A1E310; -item_name_static_vrom_start = 0x00A27660; -map_name_static_vrom_start = 0x00A352F0; -_019_0x00980f60_vrom_start = 0x00A36C10; -_020_0x009c6230_vrom_start = 0x00A7BEE0; -_020_0x009c6230_vrom_end = 0x00A807A0; -_022_0x009caaf0_vrom_start = 0x00A8C000; -_023_0x009d1500_vrom_start = 0x00A92A10; -_023_0x009d1500_vrom_end = 0x00A990E0; -_024_0x009d3760_vrom_start = 0x00A9A000; -_024_0x009d3760_vrom_end = 0x00ABFC00; -do_action_static_vrom_start = 0x00AC0000; -message_static_vrom_start = 0x00AC4000; -message_texture_static_vrom_start = 0x00ACA000; -nes_font_static_vrom_start = 0x00ACC000; -en_message_data_static_vrom_start = 0x00AD1000; -staff_message_data_static_vrom_start = 0x00B3B000; -code_vrom_start = 0x00B3C000; -code_vrom_end = 0x00C7A4E0; -nintendo_rogo_static_vrom_start = 0x01E85000; -nintendo_rogo_static_vrom_end = 0x01E87DC0; -title_static_vrom_start = 0x01E88000; -title_static_vrom_end = 0x01EB9730; -_1124_0x0163f490_vrom_start = 0x01EBA000; -_1124_0x0163f490_vrom_end = 0x01EBB280; -_1125_0x0163fc10_vrom_start = 0x01EBC000; -_1125_0x0163fc10_vrom_end = 0x01EBC680; -_1126_0x0163ffc0_vrom_start = 0x01EBD000; -_1126_0x0163ffc0_vrom_end = 0x01EC8B20; -_1127_0x01643d50_vrom_start = 0x01EC9000; -_1127_0x01643d50_vrom_end = 0x01EC9F30; -_1128_0x01644c80_vrom_start = 0x01ECA000; -_1128_0x01644c80_vrom_end = 0x01ED3B00; -_1129_0x01646b60_vrom_start = 0x01ED4000; -_1129_0x01646b60_vrom_end = 0x01EDDB00; -_1130_0x01649020_vrom_start = 0x01EDE000; -_1130_0x01649020_vrom_end = 0x01EE7B00; -_1131_0x0164ad90_vrom_start = 0x01EE8000; -_1131_0x0164ad90_vrom_end = 0x01EF1B00; -vr_fine_static_vrom_start = 0x01EF2000; -vr_cloud_static_vrom_start = 0x01EFE000; -vr_pal_static_vrom_start = 0x01F0A000; -vr_pal_static_vrom_end = 0x01F0A200; D_060005D0 = 0x060005D0; D_06001100 = 0x06001100; D_06001228 = 0x06001228;