mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Code Issues Projects Releases Wiki Activity

Fix ROM and function pointers in overlays (#88)

Browse source 
* Fix ROM pointers in overlays

ROM pointers are fewer but much harder to find so hopefully this is all of them.

* Fix function pointers in overlay data
This commit is contained in:
Roman971 2020-04-22 19:44:11 +02:00 committed by GitHub
parent 3c440ef7f1
commit 26b8e77f99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 126 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823548.s
View file

@ -48,10 +48,10 @@ glabel func_80823548
/* 0FDD8 808235F8 1701001A */ bne $t8, $at, .L80823664
/* 0FDDC 808235FC 3C048083 */ lui $a0, %hi(D_8082FD00) ## $a0 = 80830000
/* 0FDE0 80823600 8739ABA8 */ lh $t9, %lo(D_8082ABA8)($t9)
/* 0FDE4 80823604 3C0E0088 */ lui $t6, 0x0088 ## $t6 = 00880000
/* 0FDE4 80823604 3C0E0088 */ lui $t6, %hi(_map_name_staticSegmentRomStart)
/* 0FDE8 80823608 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002
/* 0FDEC 8082360C 17200015 */ bne $t9, $zero, .L80823664
/* 0FDF0 80823610 25CEE000 */ addiu $t6, $t6, 0xE000 ## $t6 = 0087E000
/* 0FDF0 80823610 25CEE000 */ addiu $t6, %lo(_map_name_staticSegmentRomStart)
/* 0FDF4 80823614 3C048016 */ lui $a0, %hi(gSaveContext+0x1409)
/* 0FDF8 80823618 9084FA69 */ lbu $a0, %lo(gSaveContext+0x1409)($a0)
/* 0FDFC 8082361C 3C078083 */ lui $a3, %hi(D_8082FCE4) ## $a3 = 80830000
@ -103,8 +103,8 @@ glabel func_80823548
/* 0FE98 808236B8 AFA30020 */ sw $v1, 0x0020($sp)
/* 0FE9C 808236BC 8FA20024 */ lw $v0, 0x0024($sp)
/* 0FEA0 808236C0 8FAA0020 */ lw $t2, 0x0020($sp)
/* 0FEA4 808236C4 3C0C0082 */ lui $t4, 0x0082 ## $t4 = 00820000
/* 0FEA8 808236C8 258C1000 */ addiu $t4, $t4, 0x1000 ## $t4 = 00821000
/* 0FEA4 808236C4 3C0C0082 */ lui $t4, %hi(_item_name_staticSegmentRomStart)
/* 0FEA8 808236C8 258C1000 */ addiu $t4, %lo(_item_name_staticSegmentRomStart)
/* 0FEAC 808236CC 3C078083 */ lui $a3, %hi(D_8082FD24) ## $a3 = 80830000
/* 0FEB0 808236D0 240D0848 */ addiu $t5, $zero, 0x0848 ## $t5 = 00000848
/* 0FEB4 808236D4 8C440138 */ lw $a0, 0x0138($v0) ## 00000138

4
asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826AEC.s
View file

@ -9,10 +9,10 @@ glabel func_80826AEC
/* 132E8 80826B08 3C040001 */ lui $a0, 0x0001 ## $a0 = 00010000
/* 132EC 80826B0C 0018CA00 */ sll $t9, $t8, 8
/* 132F0 80826B10 008E2021 */ addu $a0, $a0, $t6
/* 132F4 80826B14 3C020098 */ lui $v0, 0x0098 ## $v0 = 00980000
/* 132F4 80826B14 3C020098 */ lui $v0, %hi(_map_48x85_staticSegmentRomStart)
/* 132F8 80826B18 0338C823 */ subu $t9, $t9, $t8
/* 132FC 80826B1C 0019C8C0 */ sll $t9, $t9, 3
/* 13300 80826B20 24423000 */ addiu $v0, $v0, 0x3000 ## $v0 = 00983000
/* 13300 80826B20 24423000 */ addiu $v0, %lo(_map_48x85_staticSegmentRomStart)
/* 13304 80826B24 8C84062C */ lw $a0, 0x062C($a0) ## 0001062C
/* 13308 80826B28 3C078083 */ lui $a3, %hi(D_8082FDB0) ## $a3 = 80830000
/* 1330C 80826B2C 24080D8B */ addiu $t0, $zero, 0x0D8B ## $t0 = 00000D8B

116
asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826CB4.s
View file

@ -144,13 +144,13 @@ glabel L80826E00
/* 1369C 80826EBC 8E0F013C */ lw $t7, 0x013C($s0) ## 0000013C
/* 136A0 80826EC0 8FB80068 */ lw $t8, 0x0068($sp)
/* 136A4 80826EC4 2401FFF0 */ addiu $at, $zero, 0xFFF0 ## $at = FFFFFFF0
/* 136A8 80826EC8 3C020075 */ lui $v0, 0x0075 ## $v0 = 00750000
/* 136A8 80826EC8 3C020075 */ lui $v0, %hi(_icon_item_staticSegmentRomStart)
/* 136AC 80826ECC 01F8C821 */ addu $t9, $t7, $t8
/* 136B0 80826ED0 272E000F */ addiu $t6, $t9, 0x000F ## $t6 = 0000000F
/* 136B4 80826ED4 3C18007D */ lui $t8, 0x007D ## $t8 = 007D0000
/* 136B4 80826ED4 3C18007D */ lui $t8, %hi(_icon_item_staticSegmentRomEnd)
/* 136B8 80826ED8 01C17824 */ and $t7, $t6, $at
/* 136BC 80826EDC 27185CA0 */ addiu $t8, $t8, 0x5CA0 ## $t8 = 007D5CA0
/* 136C0 80826EE0 2442C000 */ addiu $v0, $v0, 0xC000 ## $v0 = 0074C000
/* 136BC 80826EDC 27185CA0 */ addiu $t8, %lo(_icon_item_staticSegmentRomEnd)
/* 136C0 80826EE0 2442C000 */ addiu $v0, %lo(_icon_item_staticSegmentRomStart)
/* 136C4 80826EE4 AE0F0128 */ sw $t7, 0x0128($s0) ## 00000128
/* 136C8 80826EE8 03022823 */ subu $a1, $t8, $v0
/* 136CC 80826EEC 3C048083 */ lui $a0, %hi(D_8082FE14) ## $a0 = 80830000
@ -216,13 +216,13 @@ glabel L80826E00
/* 137AC 80826FCC 8E180128 */ lw $t8, 0x0128($s0) ## 00000128
/* 137B0 80826FD0 8FB90030 */ lw $t9, 0x0030($sp)
/* 137B4 80826FD4 2401FFF0 */ addiu $at, $zero, 0xFFF0 ## $at = FFFFFFF0
/* 137B8 80826FD8 3C02007D */ lui $v0, 0x007D ## $v0 = 007D0000
/* 137B8 80826FD8 3C02007D */ lui $v0, %hi(_icon_item_24_staticSegmentRomStart)
/* 137BC 80826FDC 03197021 */ addu $t6, $t8, $t9
/* 137C0 80826FE0 25CF000F */ addiu $t7, $t6, 0x000F ## $t7 = 0000000F
/* 137C4 80826FE4 3C19007E */ lui $t9, 0x007E ## $t9 = 007E0000
/* 137C4 80826FE4 3C19007E */ lui $t9, %hi(_icon_item_24_staticSegmentRomEnd)
/* 137C8 80826FE8 01E1C024 */ and $t8, $t7, $at
/* 137CC 80826FEC 27391400 */ addiu $t9, $t9, 0x1400 ## $t9 = 007E1400
/* 137D0 80826FF0 24426000 */ addiu $v0, $v0, 0x6000 ## $v0 = 007D6000
/* 137CC 80826FEC 27391400 */ addiu $t9, %lo(_icon_item_24_staticSegmentRomEnd)
/* 137D0 80826FF0 24426000 */ addiu $v0, %lo(_icon_item_24_staticSegmentRomStart)
/* 137D4 80826FF4 AE18012C */ sw $t8, 0x012C($s0) ## 0000012C
/* 137D8 80826FF8 03222823 */ subu $a1, $t9, $v0
/* 137DC 80826FFC 3C048083 */ lui $a0, %hi(D_8082FE44) ## $a0 = 80830000
@ -258,10 +258,10 @@ glabel L80826E00
/* 13850 80827070 03000008 */ jr $t8
/* 13854 80827074 00000000 */ nop
glabel L80827078
/* 13858 80827078 3C02007F */ lui $v0, 0x007F ## $v0 = 007F0000
/* 1385C 8082707C 3C0E007F */ lui $t6, 0x007F ## $t6 = 007F0000
/* 13860 80827080 25CEFD80 */ addiu $t6, $t6, 0xFD80 ## $t6 = 007EFD80
/* 13864 80827084 2442E000 */ addiu $v0, $v0, 0xE000 ## $v0 = 007EE000
/* 13858 80827078 3C02007F */ lui $v0, %hi(_icon_item_dungeon_staticSegmentRomStart)
/* 1385C 8082707C 3C0E007F */ lui $t6, %hi(_icon_item_dungeon_staticSegmentRomEnd)
/* 13860 80827080 25CEFD80 */ addiu $t6, %lo(_icon_item_dungeon_staticSegmentRomEnd)
/* 13864 80827084 2442E000 */ addiu $v0, %lo(_icon_item_dungeon_staticSegmentRomStart)
/* 13868 80827088 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001
/* 1386C 8082708C 3C018083 */ lui $at, %hi(D_8082ABA8) ## $at = 80830000
/* 13870 80827090 01C22823 */ subu $a1, $t6, $v0
@ -294,10 +294,10 @@ glabel L80827078
/* 138D8 808270F8 10000018 */ beq $zero, $zero, .L8082715C
/* 138DC 808270FC 2529E660 */ addiu $t1, %lo(gSaveContext)
glabel L80827100
/* 138E0 80827100 3C02007E */ lui $v0, 0x007E ## $v0 = 007E0000
/* 138E4 80827104 3C0E007F */ lui $t6, 0x007F ## $t6 = 007F0000
/* 138E8 80827108 25CED930 */ addiu $t6, $t6, 0xD930 ## $t6 = 007ED930
/* 138EC 8082710C 24422000 */ addiu $v0, $v0, 0x2000 ## $v0 = 007E2000
/* 138E0 80827100 3C02007E */ lui $v0, %hi(_icon_item_field_staticSegmentRomStart)
/* 138E4 80827104 3C0E007F */ lui $t6, %hi(_icon_item_field_staticSegmentRomEnd)
/* 138E8 80827108 25CED930 */ addiu $t6, %lo(_icon_item_field_staticSegmentRomEnd)
/* 138EC 8082710C 24422000 */ addiu $v0, %lo(_icon_item_field_staticSegmentRomStart)
/* 138F0 80827110 3C018083 */ lui $at, %hi(D_8082ABA8) ## $at = 80830000
/* 138F4 80827114 01C22823 */ subu $a1, $t6, $v0
/* 138F8 80827118 3C048083 */ lui $a0, %hi(D_8082FEB8) ## $a0 = 80830000
@ -328,10 +328,10 @@ glabel L80827100
/* 13954 80827174 AE180134 */ sw $t8, 0x0134($s0) ## 00000134
/* 13958 80827178 91231409 */ lbu $v1, 0x1409($t1) ## 8015FA69
/* 1395C 8082717C 14600015 */ bne $v1, $zero, .L808271D4
/* 13960 80827180 3C02007F */ lui $v0, 0x007F ## $v0 = 007F0000
/* 13964 80827184 3C190080 */ lui $t9, 0x0080 ## $t9 = 00800000
/* 13968 80827188 27391C80 */ addiu $t9, $t9, 0x1C80 ## $t9 = 00801C80
/* 1396C 8082718C 24424000 */ addiu $v0, $v0, 0x4000 ## $v0 = 007F4000
/* 13960 80827180 3C02007F */ lui $v0, %hi(_icon_item_nes_staticSegmentRomStart)
/* 13964 80827184 3C190080 */ lui $t9, %hi(_icon_item_nes_staticSegmentRomEnd)
/* 13968 80827188 27391C80 */ addiu $t9, %lo(_icon_item_nes_staticSegmentRomEnd)
/* 1396C 8082718C 24424000 */ addiu $v0, %lo(_icon_item_nes_staticSegmentRomStart)
/* 13970 80827190 03222823 */ subu $a1, $t9, $v0
/* 13974 80827194 3C048083 */ lui $a0, %hi(D_8082FEF4) ## $a0 = 80830000
/* 13978 80827198 AFA50070 */ sw $a1, 0x0070($sp)
@ -353,11 +353,11 @@ glabel L80827100
.L808271D4:
/* 139B4 808271D4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001
/* 139B8 808271D8 14610016 */ bne $v1, $at, .L80827234
/* 139BC 808271DC 3C020081 */ lui $v0, 0x0081 ## $v0 = 00810000
/* 139C0 808271E0 3C020080 */ lui $v0, 0x0080 ## $v0 = 00800000
/* 139C4 808271E4 3C0F0081 */ lui $t7, 0x0081 ## $t7 = 00810000
/* 139C8 808271E8 25EF0B80 */ addiu $t7, $t7, 0x0B80 ## $t7 = 00810B80
/* 139CC 808271EC 24422000 */ addiu $v0, $v0, 0x2000 ## $v0 = 00802000
/* 139BC 808271DC 3C020081 */ lui $v0, %hi(_icon_item_fra_staticSegmentRomStart)
/* 139C0 808271E0 3C020080 */ lui $v0, %hi(_icon_item_ger_staticSegmentRomStart)
/* 139C4 808271E4 3C0F0081 */ lui $t7, %hi(_icon_item_ger_staticSegmentRomEnd)
/* 139C8 808271E8 25EF0B80 */ addiu $t7, %lo(_icon_item_ger_staticSegmentRomEnd)
/* 139CC 808271EC 24422000 */ addiu $v0, %lo(_icon_item_ger_staticSegmentRomStart)
/* 139D0 808271F0 01E22823 */ subu $a1, $t7, $v0
/* 139D4 808271F4 3C048083 */ lui $a0, %hi(D_8082FF34) ## $a0 = 80830000
/* 139D8 808271F8 AFA50070 */ sw $a1, 0x0070($sp)
@ -377,9 +377,9 @@ glabel L80827100
/* 13A0C 8082722C 10000014 */ beq $zero, $zero, .L80827280
/* 13A10 80827230 8E0F0134 */ lw $t7, 0x0134($s0) ## 00000134
.L80827234:
/* 13A14 80827234 3C190082 */ lui $t9, 0x0082 ## $t9 = 00820000
/* 13A18 80827238 27390480 */ addiu $t9, $t9, 0x0480 ## $t9 = 00820480
/* 13A1C 8082723C 24421000 */ addiu $v0, $v0, 0x1000 ## $v0 = 00001000
/* 13A14 80827234 3C190082 */ lui $t9, %hi(_icon_item_fra_staticSegmentRomEnd)
/* 13A18 80827238 27390480 */ addiu $t9, %lo(_icon_item_fra_staticSegmentRomEnd)
/* 13A1C 8082723C 24421000 */ addiu $v0, %lo(_icon_item_fra_staticSegmentRomStart)
/* 13A20 80827240 03222823 */ subu $a1, $t9, $v0
/* 13A24 80827244 3C048083 */ lui $a0, %hi(D_8082FF74) ## $a0 = 80830000
/* 13A28 80827248 AFA50070 */ sw $a1, 0x0070($sp)
@ -446,8 +446,8 @@ glabel L80827100
/* 13B08 80827328 8E040138 */ lw $a0, 0x0138($s0) ## 00000138
/* 13B0C 8082732C 000E7240 */ sll $t6, $t6, 9
/* 13B10 80827330 34019000 */ ori $at, $zero, 0x9000 ## $at = 00009000
/* 13B14 80827334 3C180088 */ lui $t8, 0x0088 ## $t8 = 00880000
/* 13B18 80827338 2718E000 */ addiu $t8, $t8, 0xE000 ## $t8 = 0087E000
/* 13B14 80827334 3C180088 */ lui $t8, %hi(_map_name_staticSegmentRomStart)
/* 13B18 80827338 2718E000 */ addiu $t8, %lo(_map_name_staticSegmentRomStart)
/* 13B1C 8082733C 01C17821 */ addu $t7, $t6, $at
/* 13B20 80827340 3C078083 */ lui $a3, %hi(D_8082FFE4) ## $a3 = 80830000
/* 13B24 80827344 24190EC0 */ addiu $t9, $zero, 0x0EC0 ## $t9 = 00000EC0
@ -470,8 +470,8 @@ glabel L80827100
/* 13B64 80827384 8E040138 */ lw $a0, 0x0138($s0) ## 00000138
/* 13B68 80827388 34216C00 */ ori $at, $at, 0x6C00 ## $at = 00016C00
/* 13B6C 8082738C 000E7240 */ sll $t6, $t6, 9
/* 13B70 80827390 3C180088 */ lui $t8, 0x0088 ## $t8 = 00880000
/* 13B74 80827394 2718E000 */ addiu $t8, $t8, 0xE000 ## $t8 = 0087E000
/* 13B70 80827390 3C180088 */ lui $t8, %hi(_map_name_staticSegmentRomStart)
/* 13B74 80827394 2718E000 */ addiu $t8, %lo(_map_name_staticSegmentRomStart)
/* 13B78 80827398 01C17821 */ addu $t7, $t6, $at
/* 13B7C 8082739C 3C078083 */ lui $a3, %hi(D_80830000) ## $a3 = 80830000
/* 13B80 808273A0 24190EC4 */ addiu $t9, $zero, 0x0EC4 ## $t9 = 00000EC4
@ -491,8 +491,8 @@ glabel L80827100
/* 13BB4 808273D4 8E040138 */ lw $a0, 0x0138($s0) ## 00000138
/* 13BB8 808273D8 34214800 */ ori $at, $at, 0x4800 ## $at = 00024800
/* 13BBC 808273DC 000E7240 */ sll $t6, $t6, 9
/* 13BC0 808273E0 3C180088 */ lui $t8, 0x0088 ## $t8 = 00880000
/* 13BC4 808273E4 2718E000 */ addiu $t8, $t8, 0xE000 ## $t8 = 0087E000
/* 13BC0 808273E0 3C180088 */ lui $t8, %hi(_map_name_staticSegmentRomStart)
/* 13BC4 808273E4 2718E000 */ addiu $t8, %lo(_map_name_staticSegmentRomStart)
/* 13BC8 808273E8 01C17821 */ addu $t7, $t6, $at
/* 13BCC 808273EC 3C078083 */ lui $a3, %hi(D_8083001C) ## $a3 = 80830000
/* 13BD0 808273F0 24190EC8 */ addiu $t9, $zero, 0x0EC8 ## $t9 = 00000EC8
@ -1866,12 +1866,12 @@ glabel L808286FC
/* 14F2C 8082874C 01F17821 */ addu $t7, $t7, $s1
/* 14F30 80828750 8DEF17A4 */ lw $t7, 0x17A4($t7) ## 000117A4
/* 14F34 80828754 2401FFC0 */ addiu $at, $zero, 0xFFC0 ## $at = FFFFFFC0
/* 14F38 80828758 3C020075 */ lui $v0, 0x0075 ## $v0 = 00750000
/* 14F3C 8082875C 3C18007D */ lui $t8, 0x007D ## $t8 = 007D0000
/* 14F38 80828758 3C020075 */ lui $v0, %hi(_icon_item_staticSegmentRomStart)
/* 14F3C 8082875C 3C18007D */ lui $t8, %hi(_icon_item_staticSegmentRomEnd)
/* 14F40 80828760 25F90030 */ addiu $t9, $t7, 0x0030 ## $t9 = 00010030
/* 14F44 80828764 03217024 */ and $t6, $t9, $at
/* 14F48 80828768 27185CA0 */ addiu $t8, $t8, 0x5CA0 ## $t8 = 007D5CA0
/* 14F4C 8082876C 2442C000 */ addiu $v0, $v0, 0xC000 ## $v0 = 0074C000
/* 14F48 80828768 27185CA0 */ addiu $t8, %lo(_icon_item_staticSegmentRomEnd)
/* 14F4C 8082876C 2442C000 */ addiu $v0, %lo(_icon_item_staticSegmentRomStart)
/* 14F50 80828770 AE0E0128 */ sw $t6, 0x0128($s0) ## 00000128
/* 14F54 80828774 03022823 */ subu $a1, $t8, $v0
/* 14F58 80828778 3C048083 */ lui $a0, %hi(D_80830038) ## $a0 = 80830000
@ -1891,13 +1891,13 @@ glabel L808286FC
/* 14F8C 808287AC 8E190128 */ lw $t9, 0x0128($s0) ## 00000128
/* 14F90 808287B0 8FAE0030 */ lw $t6, 0x0030($sp)
/* 14F94 808287B4 2401FFF0 */ addiu $at, $zero, 0xFFF0 ## $at = FFFFFFF0
/* 14F98 808287B8 3C03007D */ lui $v1, 0x007D ## $v1 = 007D0000
/* 14F98 808287B8 3C03007D */ lui $v1, %hi(_icon_item_24_staticSegmentRomStart)
/* 14F9C 808287BC 032EC021 */ addu $t8, $t9, $t6
/* 14FA0 808287C0 270F000F */ addiu $t7, $t8, 0x000F ## $t7 = 0000000F
/* 14FA4 808287C4 3C0E007E */ lui $t6, 0x007E ## $t6 = 007E0000
/* 14FA4 808287C4 3C0E007E */ lui $t6, %hi(_icon_item_24_staticSegmentRomEnd)
/* 14FA8 808287C8 01E1C824 */ and $t9, $t7, $at
/* 14FAC 808287CC 25CE1400 */ addiu $t6, $t6, 0x1400 ## $t6 = 007E1400
/* 14FB0 808287D0 24636000 */ addiu $v1, $v1, 0x6000 ## $v1 = 007D6000
/* 14FAC 808287CC 25CE1400 */ addiu $t6, %lo(_icon_item_24_staticSegmentRomEnd)
/* 14FB0 808287D0 24636000 */ addiu $v1, %lo(_icon_item_24_staticSegmentRomStart)
/* 14FB4 808287D4 AE19012C */ sw $t9, 0x012C($s0) ## 0000012C
/* 14FB8 808287D8 01C32823 */ subu $a1, $t6, $v1
/* 14FBC 808287DC 3C048083 */ lui $a0, %hi(D_80830068) ## $a0 = 80830000
@ -1917,13 +1917,13 @@ glabel L808286FC
/* 14FF0 80828810 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000
/* 14FF4 80828814 8E0F012C */ lw $t7, 0x012C($s0) ## 0000012C
/* 14FF8 80828818 2401FFF0 */ addiu $at, $zero, 0xFFF0 ## $at = FFFFFFF0
/* 14FFC 8082881C 3C03007F */ lui $v1, 0x007F ## $v1 = 007F0000
/* 14FFC 8082881C 3C03007F */ lui $v1, %hi(_icon_item_gameover_staticSegmentRomStart)
/* 15000 80828820 01F1C821 */ addu $t9, $t7, $s1
/* 15004 80828824 272E000F */ addiu $t6, $t9, 0x000F ## $t6 = 0000000F
/* 15008 80828828 3C0F007F */ lui $t7, 0x007F ## $t7 = 007F0000
/* 15008 80828828 3C0F007F */ lui $t7, %hi(_icon_item_gameover_staticSegmentRomEnd)
/* 1500C 8082882C 01C1C024 */ and $t8, $t6, $at
/* 15010 80828830 25EF3C80 */ addiu $t7, $t7, 0x3C80 ## $t7 = 007F3C80
/* 15014 80828834 24630000 */ addiu $v1, $v1, 0x0000 ## $v1 = 007F0000
/* 15010 80828830 25EF3C80 */ addiu $t7, %lo(_icon_item_gameover_staticSegmentRomEnd)
/* 15014 80828834 24630000 */ addiu $v1, %lo(_icon_item_gameover_staticSegmentRomStart)
/* 15018 80828838 AE180130 */ sw $t8, 0x0130($s0) ## 00000130
/* 1501C 8082883C 01E32823 */ subu $a1, $t7, $v1
/* 15020 80828840 3C048083 */ lui $a0, %hi(D_8083009C) ## $a0 = 80830000
@ -1954,10 +1954,10 @@ glabel L808286FC
/* 15080 808288A0 248400E0 */ addiu $a0, $a0, %lo(D_808300E0) ## $a0 = 808300E0
/* 15084 808288A4 14600015 */ bne $v1, $zero, .L808288FC
/* 15088 808288A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001
/* 1508C 808288AC 3C02007F */ lui $v0, 0x007F ## $v0 = 007F0000
/* 15090 808288B0 3C0E0080 */ lui $t6, 0x0080 ## $t6 = 00800000
/* 15094 808288B4 25CE1C80 */ addiu $t6, $t6, 0x1C80 ## $t6 = 00801C80
/* 15098 808288B8 24424000 */ addiu $v0, $v0, 0x4000 ## $v0 = 007F4000
/* 1508C 808288AC 3C02007F */ lui $v0, %hi(_icon_item_nes_staticSegmentRomStart)
/* 15090 808288B0 3C0E0080 */ lui $t6, %hi(_icon_item_nes_staticSegmentRomEnd)
/* 15094 808288B4 25CE1C80 */ addiu $t6, %lo(_icon_item_nes_staticSegmentRomEnd)
/* 15098 808288B8 24424000 */ addiu $v0, %lo(_icon_item_nes_staticSegmentRomStart)
/* 1509C 808288BC 01C23023 */ subu $a2, $t6, $v0
/* 150A0 808288C0 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000
/* 150A4 808288C4 AFA6002C */ sw $a2, 0x002C($sp)
@ -1978,10 +1978,10 @@ glabel L808286FC
.L808288FC:
/* 150DC 808288FC 14610017 */ bne $v1, $at, .L8082895C
/* 150E0 80828900 3C048083 */ lui $a0, %hi(D_80830160) ## $a0 = 80830000
/* 150E4 80828904 3C020080 */ lui $v0, 0x0080 ## $v0 = 00800000
/* 150E8 80828908 3C0F0081 */ lui $t7, 0x0081 ## $t7 = 00810000
/* 150EC 8082890C 25EF0B80 */ addiu $t7, $t7, 0x0B80 ## $t7 = 00810B80
/* 150F0 80828910 24422000 */ addiu $v0, $v0, 0x2000 ## $v0 = 00802000
/* 150E4 80828904 3C020080 */ lui $v0, %hi(_icon_item_ger_staticSegmentRomStart)
/* 150E8 80828908 3C0F0081 */ lui $t7, %hi(_icon_item_ger_staticSegmentRomEnd)
/* 150EC 8082890C 25EF0B80 */ addiu $t7, %lo(_icon_item_ger_staticSegmentRomEnd)
/* 150F0 80828910 24422000 */ addiu $v0, %lo(_icon_item_ger_staticSegmentRomStart)
/* 150F4 80828914 01E23023 */ subu $a2, $t7, $v0
/* 150F8 80828918 3C048083 */ lui $a0, %hi(D_80830120) ## $a0 = 80830000
/* 150FC 8082891C 24840120 */ addiu $a0, $a0, %lo(D_80830120) ## $a0 = 80830120
@ -2002,10 +2002,10 @@ glabel L808286FC
/* 15134 80828954 10000015 */ beq $zero, $zero, .L808289AC
/* 15138 80828958 2508FA90 */ addiu $t0, %lo(gGameInfo)
.L8082895C:
/* 1513C 8082895C 3C020081 */ lui $v0, 0x0081 ## $v0 = 00810000
/* 15140 80828960 3C0E0082 */ lui $t6, 0x0082 ## $t6 = 00820000
/* 15144 80828964 25CE0480 */ addiu $t6, $t6, 0x0480 ## $t6 = 00820480
/* 15148 80828968 24421000 */ addiu $v0, $v0, 0x1000 ## $v0 = 00811000
/* 1513C 8082895C 3C020081 */ lui $v0, %hi(_icon_item_fra_staticSegmentRomStart)
/* 15140 80828960 3C0E0082 */ lui $t6, %hi(_icon_item_fra_staticSegmentRomEnd)
/* 15144 80828964 25CE0480 */ addiu $t6, %lo(_icon_item_fra_staticSegmentRomEnd)
/* 15148 80828968 24421000 */ addiu $v0, %lo(_icon_item_fra_staticSegmentRomStart)
/* 1514C 8082896C 01C23023 */ subu $a2, $t6, $v0
/* 15150 80828970 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000
/* 15154 80828974 AFA6002C */ sw $a2, 0x002C($sp)

16
asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s
View file

@ -3,13 +3,13 @@ glabel func_80811A20
/* 0DCE4 80811A24 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7)
/* 0DCE8 80811A28 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0
/* 0DCEC 80811A2C AFB00020 */ sw $s0, 0x0020($sp)
/* 0DCF0 80811A30 3C0201AA */ lui $v0, 0x01AA ## $v0 = 01AA0000
/* 0DCF4 80811A34 3C1801AF */ lui $t8, 0x01AF ## $t8 = 01AF0000
/* 0DCF0 80811A30 3C0201AA */ lui $v0, %hi(_title_staticSegmentRomStart)
/* 0DCF4 80811A34 3C1801AF */ lui $t8, %hi(_title_staticSegmentRomEnd)
/* 0DCF8 80811A38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000
/* 0DCFC 80811A3C AFBF0024 */ sw $ra, 0x0024($sp)
/* 0DD00 80811A40 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001
/* 0DD04 80811A44 2718B440 */ addiu $t8, $t8, 0xB440 ## $t8 = 01AEB440
/* 0DD08 80811A48 24424000 */ addiu $v0, $v0, 0x4000 ## $v0 = 01AA4000
/* 0DD04 80811A44 2718B440 */ addiu $t8, %lo(_title_staticSegmentRomEnd)
/* 0DD08 80811A48 24424000 */ addiu $v0, %lo(_title_staticSegmentRomStart)
/* 0DD0C 80811A4C 03022823 */ subu $a1, $t8, $v0
/* 0DD10 80811A50 3C048081 */ lui $a0, %hi(D_80812F48) ## $a0 = 80810000
/* 0DD14 80811A54 A5EE0110 */ sh $t6, 0x0110($t7) ## 80160110
@ -43,10 +43,10 @@ glabel func_80811A20
/* 0DD74 80811AB4 8FA50030 */ lw $a1, 0x0030($sp)
/* 0DD78 80811AB8 0C0006A8 */ jal DmaMgr_SendRequest1
/* 0DD7C 80811ABC 8FA6002C */ lw $a2, 0x002C($sp)
/* 0DD80 80811AC0 3C0301AF */ lui $v1, 0x01AF ## $v1 = 01AF0000
/* 0DD84 80811AC4 3C0801AF */ lui $t0, 0x01AF ## $t0 = 01AF0000
/* 0DD88 80811AC8 2508FB00 */ addiu $t0, $t0, 0xFB00 ## $t0 = 01AEFB00
/* 0DD8C 80811ACC 2463C000 */ addiu $v1, $v1, 0xC000 ## $v1 = 01AEC000
/* 0DD80 80811AC0 3C0301AF */ lui $v1, %hi(_parameter_staticSegmentRomStart)
/* 0DD84 80811AC4 3C0801AF */ lui $t0, %hi(_parameter_staticSegmentRomEnd)
/* 0DD88 80811AC8 2508FB00 */ addiu $t0, %lo(_parameter_staticSegmentRomEnd)
/* 0DD8C 80811ACC 2463C000 */ addiu $v1, %lo(_parameter_staticSegmentRomStart)
/* 0DD90 80811AD0 01032823 */ subu $a1, $t0, $v1
/* 0DD94 80811AD4 3C068081 */ lui $a2, %hi(D_80812FAC) ## $a2 = 80810000
/* 0DD98 80811AD8 24C62FAC */ addiu $a2, $a2, %lo(D_80812FAC) ## $a2 = 80812FAC

8
asm/non_matchings/overlays/gamestates/ovl_select/func_80801E44.s
View file

@ -46,13 +46,13 @@ glabel func_80801E44
/* 01364 80801EF4 AE000230 */ sw $zero, 0x0230($s0) ## 00000230
/* 01368 80801EF8 AE000234 */ sw $zero, 0x0234($s0) ## 00000234
/* 0136C 80801EFC 8C820000 */ lw $v0, 0x0000($a0) ## 8015FA90
/* 01370 80801F00 3C0B01AA */ lui $t3, 0x01AA ## $t3 = 01AA0000
/* 01370 80801F00 3C0B01AA */ lui $t3, %hi(_z_select_staticSegmentRomEnd)
/* 01374 80801F04 3C068080 */ lui $a2, %hi(D_808035CC) ## $a2 = 80800000
/* 01378 80801F08 84431434 */ lh $v1, 0x1434($v0) ## 00001434
/* 0137C 80801F0C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001
/* 01380 80801F10 24C635CC */ addiu $a2, $a2, %lo(D_808035CC) ## $a2 = 808035CC
/* 01384 80801F14 0460000D */ bltz $v1, .L80801F4C
/* 01388 80801F18 256B0200 */ addiu $t3, $t3, 0x0200 ## $t3 = 01AA0200
/* 01388 80801F18 256B0200 */ addiu $t3, %lo(_z_select_staticSegmentRomEnd)
/* 0138C 80801F1C 8E0F01D0 */ lw $t7, 0x01D0($s0) ## 000001D0
/* 01390 80801F20 006F082A */ slt $at, $v1, $t7
/* 01394 80801F24 10200009 */ beq $at, $zero, .L80801F4C
@ -66,8 +66,8 @@ glabel func_80801E44
/* 013B4 80801F44 AE0901DC */ sw $t1, 0x01DC($s0) ## 000001DC
/* 013B8 80801F48 8C820000 */ lw $v0, 0x0000($a0) ## 8015FA90
.L80801F4C:
/* 013BC 80801F4C 3C0301AA */ lui $v1, 0x01AA ## $v1 = 01AA0000
/* 013C0 80801F50 2463E000 */ addiu $v1, $v1, 0xE000 ## $v1 = 01A9E000
/* 013BC 80801F4C 3C0301AA */ lui $v1, %hi(_z_select_staticSegmentRomStart)
/* 013C0 80801F50 2463E000 */ addiu $v1, %lo(_z_select_staticSegmentRomStart)
/* 013C4 80801F54 A44A0110 */ sh $t2, 0x0110($v0) ## 00000110
/* 013C8 80801F58 01632823 */ subu $a1, $t3, $v1
/* 013CC 80801F5C AFA5002C */ sw $a1, 0x002C($sp)

72
data/overlays/actors/z_en_girla.data.s
View file

@ -69,23 +69,23 @@ glabel D_80A3C658
glabel D_80A3C668
.word 0x70B670B5, 0x70B470B7, 0x70BB0000
glabel D_80A3C674
.word 0x00BB0011, 0x8002ED80, 0x000F0005, 0x00B2007F, 0x00000063
.word 0x00BB0011, func_8002ED80, 0x000F0005, 0x00B2007F, 0x00000063
.word func_80A3ABF8
.word func_80A3B714
.word func_80A3BB6C
.word 0x00D80025, 0x8002EBCC, 0x003C001E, 0x00C1009B, 0x0000004A
.word 0x00D80025, func_8002EBCC, 0x003C001E, 0x00C1009B, 0x0000004A
.word func_80A3AAA8
.word func_80A3B634
.word func_80A3BB6C
.word 0x00D80026, 0x8002EBCC, 0x005A0032, 0x00B0007D, 0x0000004B
.word 0x00D80026, func_8002EBCC, 0x005A0032, 0x00B0007D, 0x0000004B
.word func_80A3AAA8
.word func_80A3B634
.word func_80A3BB6C
.word 0x00CE001F, 0x8002EBCC, 0x00190005, 0x00A3008B, 0x00000001
.word 0x00CE001F, func_8002EBCC, 0x00190005, 0x00A3008B, 0x00000001
.word func_80A3AB58
.word func_80A3B678
.word func_80A3BB6C
.word 0x00BB0011, 0x8002ED80, 0x001E000A, 0x00A20087, 0x00000064
.word 0x00BB0011, func_8002ED80, 0x001E000A, 0x00A20087, 0x00000064
.word func_80A3ABF8
.word func_80A3B714
.word func_80A3BB6C
@ -93,35 +93,35 @@ glabel D_80A3C674
.word func_80A3ACAC
.word func_80A3B780
.word func_80A3BB6C
.word 0x00CE001F, 0x8002EBCC, 0x0032000A, 0x00B1007C, 0x00000066
.word 0x00CE001F, func_8002EBCC, 0x0032000A, 0x00B1007C, 0x00000066
.word func_80A3AB58
.word func_80A3B678
.word func_80A3BB6C
.word 0x00F4003E, 0x8002ED80, 0x00C80001, 0x00B3007E, 0x0000006C
.word 0x00F4003E, func_8002ED80, 0x00C80001, 0x00B3007E, 0x0000006C
.word func_80A3AD60
.word 0x00000000
.word func_80A3BB6C
.word 0x00EB0037, 0x8002EBCC, 0x001E0001, 0x00A5008E, 0x00000010
.word 0x00EB0037, func_8002EBCC, 0x001E0001, 0x00A5008E, 0x00000010
.word func_80A3ADD4
.word func_80A3BA40
.word func_80A3BB6C
.word 0x00EB0036, 0x8002EBCC, 0x001E0001, 0x00A6008F, 0x00000011
.word 0x00EB0036, func_8002EBCC, 0x001E0001, 0x00A6008F, 0x00000011
.word func_80A3AE48
.word func_80A3BA40
.word func_80A3BB6C
.word 0x00EB0038, 0x8002EBCC, 0x003C0001, 0x00A70090, 0x00000012
.word 0x00EB0038, func_8002EBCC, 0x003C0001, 0x00A70090, 0x00000012
.word func_80A3AEBC
.word func_80A3BA40
.word func_80A3BB6C
.word 0x00F80042, 0x8002EBCC, 0x03E80001, 0x00A80091, 0x00000028
.word 0x00F80042, func_8002EBCC, 0x03E80001, 0x00A80091, 0x00000028
.word func_80A3AF30
.word func_80A3B7BC
.word func_80A3BB6C
.word 0x00DC002B, 0x8002EBCC, 0x00500001, 0x00A90092, 0x0000002A
.word 0x00DC002B, func_8002EBCC, 0x00500001, 0x00A90092, 0x0000002A
.word func_80A3AFC4
.word func_80A3B800
.word func_80A3BB6C
.word 0x00CB001C, 0x8002EBCC, 0x00280001, 0x009F0089, 0x00000029
.word 0x00CB001C, func_8002EBCC, 0x00280001, 0x009F0089, 0x00000029
.word func_80A3B040
.word func_80A3B83C
.word func_80A3BB6C
@ -143,7 +143,7 @@ glabel D_80A3C674
.word func_80A3B250
.word func_80A3B92C
.word func_80A3BB6C
.word 0x00DA0028, 0x8002EBCC, 0x00640001, 0x00AE0099, 0x00000047
.word 0x00DA0028, func_8002EBCC, 0x00640001, 0x00AE0099, 0x00000047
.word func_80A3B2AC
.word func_80A3B968
.word func_80A3BB6C
@ -153,59 +153,59 @@ glabel D_80A3C674
.word func_80A3B308
.word func_80A3B9A4
.word func_80A3BB6C
.word 0x00DA0028, 0x8002EBCC, 0x27100001, 0x00B50085, 0x00000000
.word 0x00DA0028, func_8002EBCC, 0x27100001, 0x00B50085, 0x00000000
.word func_80A3B318
.word func_80A3B9D4
.word func_80A3BB6C
.word 0x00D90027, 0x8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003
.word 0x00D90027, func_8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003
.word func_80A3B328
.word 0x00000000
.word func_80A3BC6C
.word 0x00D90027, 0x8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B
.word 0x00D90027, func_8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B
.word func_80A3B328
.word 0x00000000
.word func_80A3BC6C
.word 0x00D90027, 0x8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B
.word 0x00D90027, func_8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B
.word func_80A3B328
.word 0x00000000
.word func_80A3BC6C
.word 0x00D90027, 0x8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003
.word 0x00D90027, func_8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003
.word func_80A3B328
.word 0x00000000
.word func_80A3BC6C
.word 0x00D90027, 0x8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003
.word 0x00D90027, func_8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003
.word func_80A3B328
.word 0x00000000
.word func_80A3BC6C
.word 0x00D90027, 0x8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B
.word 0x00D90027, func_8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B
.word func_80A3B328
.word 0x00000000
.word func_80A3BC6C
.word 0x00D90027, 0x8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B
.word 0x00D90027, func_8002EBCC, 0x00B40014, 0x0061002A, 0x0000006B
.word func_80A3B328
.word 0x00000000
.word func_80A3BC6C
.word 0x00D90027, 0x8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003
.word 0x00D90027, func_8002EBCC, 0x0064000A, 0x00BC008C, 0x00000003
.word func_80A3B328
.word 0x00000000
.word func_80A3BC6C
.word 0x01190047, 0x8002EBCC, 0x001E001E, 0x00DF00DE, 0x00000069
.word 0x01190047, func_8002EBCC, 0x001E001E, 0x00DF00DE, 0x00000069
.word func_80A3B3A8
.word func_80A3BA04
.word func_80A3BB6C
.word 0x01340030, 0x8002EBCC, 0x00000001, 0x70B270BE, 0x0000001A
.word 0x01340030, func_8002EBCC, 0x00000001, 0x70B270BE, 0x0000001A
.word func_80A3B3A8
.word func_80A3BA04
.word func_80A3BB6C
.word 0x01350031, 0x8002EBCC, 0x00000001, 0x70B170BD, 0x00000018
.word 0x01350031, func_8002EBCC, 0x00000001, 0x70B170BD, 0x00000018
.word func_80A3B3A8
.word func_80A3BA04
.word func_80A3BB6C
.word 0x0136004E, 0x8002EBCC, 0x00000001, 0x70B070BC, 0x00000017
.word 0x0136004E, func_8002EBCC, 0x00000001, 0x70B070BC, 0x00000017
.word func_80A3B3A8
.word func_80A3BA04
.word func_80A3BB6C
.word 0x0137004F, 0x8002EBCC, 0x00000001, 0x70B370BF, 0x0000001B
.word 0x0137004F, func_8002EBCC, 0x00000001, 0x70B370BF, 0x0000001B
.word func_80A3B3A8
.word func_80A3BA04
.word func_80A3BB6C
@ -227,9 +227,9 @@ glabel D_80A3C674
.word func_80A3B3A8
.word func_80A3BA04
.word func_80A3BB6C
.word 0x01480058, 0x8002EBCC, 0x00000000, 0x00BD70C2, 0x00000053
.word 0x01480058, func_8002EBCC, 0x00000000, 0x00BD70C2, 0x00000053
.word func_80A3B454
.word 0x00000000, 0x00000000, 0x01730066, 0x8002EBCC, 0x012C0001, 0x00B900B8, 0x0000006E
.word 0x00000000, 0x00000000, 0x01730066, func_8002EBCC, 0x012C0001, 0x00B900B8, 0x0000006E
.word func_80A3B464
.word func_80A3BA40
.word func_80A3BB6C
@ -257,27 +257,27 @@ glabel D_80A3C674
.word func_80A3B5C0
.word func_80A3BA40
.word func_80A3BB6C
.word 0x00D80024, 0x8002EBCC, 0x0014000A, 0x00A0008A, 0x00000049
.word 0x00D80024, func_8002EBCC, 0x0014000A, 0x00A0008A, 0x00000049
.word func_80A3AAA8
.word func_80A3B634
.word func_80A3BB6C
.word 0x00CE001F, 0x8002EBCC, 0x00500014, 0x001C0006, 0x00000067
.word 0x00CE001F, func_8002EBCC, 0x00500014, 0x001C0006, 0x00000067
.word func_80A3AB58
.word func_80A3B678
.word func_80A3BB6C
.word 0x00CE001F, 0x8002EBCC, 0x0078001E, 0x001D001E, 0x00000068
.word 0x00CE001F, func_8002EBCC, 0x0078001E, 0x001D001E, 0x00000068
.word func_80A3AB58
.word func_80A3B678
.word func_80A3BB6C
.word 0x00CE001F, 0x8002EBCC, 0x00230005, 0x00CB00CA, 0x00000001
.word 0x00CE001F, func_8002EBCC, 0x00230005, 0x00CB00CA, 0x00000001
.word func_80A3AB58
.word func_80A3B678
.word func_80A3BB6C
.word 0x00EB0037, 0x8002EBCC, 0x00280001, 0x00640062, 0x00000010
.word 0x00EB0037, func_8002EBCC, 0x00280001, 0x00640062, 0x00000010
.word func_80A3ADD4
.word func_80A3BA40
.word func_80A3BB6C
.word 0x00EB0037, 0x8002EBCC, 0x00320001, 0x00650063, 0x00000010
.word 0x00EB0037, func_8002EBCC, 0x00320001, 0x00650063, 0x00000010
.word func_80A3ADD4
.word func_80A3BA40
.word func_80A3BB6C

2
data/overlays/actors/z_en_viewer.data.s
View file

@ -25,7 +25,7 @@ glabel D_80B2CFB0
.word func_80B2A300
.word func_80B2A448
glabel D_80B2CFC0
.word 0x00000000, 0x8002B5EC, 0x8002B644
.word 0x00000000, ActorShadow_DrawFunc_Circle, ActorShadow_DrawFunc_Squiggly
glabel D_80B2CFCC
.word 0x00000000
glabel D_80B2CFD0

2
data/overlays/actors/z_obj_makeoshihiki.data.s
View file

@ -18,5 +18,5 @@ glabel D_80B988F0
glabel D_80B98948
.word 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000001
glabel D_80B98960
.word 0x8002CBB4, 0x8002CB74, 0x00000000, 0x00000000
.word Flags_UnsetSwitch, Flags_SetSwitch, 0x00000000, 0x00000000

12
include/segment_symbols.h
View file

@ -31,6 +31,14 @@ DECLARE_ROM_SEGMENT(Audiotable)
DECLARE_ROM_SEGMENT(link_animetion)
DECLARE_ROM_SEGMENT(icon_item_static)
DECLARE_ROM_SEGMENT(icon_item_24_static)
DECLARE_ROM_SEGMENT(icon_item_field_static)
DECLARE_ROM_SEGMENT(icon_item_dungeon_static)
DECLARE_ROM_SEGMENT(icon_item_gameover_static)
DECLARE_ROM_SEGMENT(icon_item_nes_static)
DECLARE_ROM_SEGMENT(icon_item_ger_static)
DECLARE_ROM_SEGMENT(icon_item_fra_static)
DECLARE_ROM_SEGMENT(item_name_static)
DECLARE_ROM_SEGMENT(map_name_static)
DECLARE_ROM_SEGMENT(do_action_static)
DECLARE_ROM_SEGMENT(message_static)
DECLARE_ROM_SEGMENT(message_texture_static)
@ -38,7 +46,10 @@ DECLARE_ROM_SEGMENT(nes_font_static)
DECLARE_ROM_SEGMENT(nes_message_data_static)
DECLARE_ROM_SEGMENT(ger_message_data_static)
DECLARE_ROM_SEGMENT(fra_message_data_static)
DECLARE_ROM_SEGMENT(staff_message_data_static)
DECLARE_ROM_SEGMENT(map_grand_static)
DECLARE_ROM_SEGMENT(map_i_static)
DECLARE_ROM_SEGMENT(map_48x85_static)
DECLARE_ROM_SEGMENT(code)
DECLARE_BSS_SEGMENT(code)
@ -921,6 +932,7 @@ DECLARE_ROM_SEGMENT(g_pn_55)
DECLARE_ROM_SEGMENT(g_pn_56)
DECLARE_ROM_SEGMENT(g_pn_57)
DECLARE_ROM_SEGMENT(z_select_static)
DECLARE_ROM_SEGMENT(nintendo_rogo_static)
DECLARE_ROM_SEGMENT(title_static)
DECLARE_ROM_SEGMENT(parameter_static)