diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
| commit | 8cd4908fa3820b22a8b4e3d96780d725132549c4 (patch) | |
| tree | bcc8e697ce7dd0d4ab532a61fccafbbdb6d2400e /data/menu_indicators.s | |
| parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
| parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) | |
merge bike with master, fix conflicts
Diffstat (limited to 'data/menu_indicators.s')
| -rw-r--r-- | data/menu_indicators.s | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/data/menu_indicators.s b/data/menu_indicators.s index ee97261cd..43fc0e139 100644 --- a/data/menu_indicators.s +++ b/data/menu_indicators.s @@ -10,28 +10,31 @@ gUnknown_08614244:: @ 8614244 .incbin "baserom.gba", 0x614244, 0x18 gUnknown_0861425C:: @ 861425C - .incbin "baserom.gba", 0x61425c, 0x4 + .4byte 0x00000000 gUnknown_08614260:: @ 8614260 - .incbin "baserom.gba", 0x614260, 0x4 + .4byte 0x00100000 gUnknown_08614264:: @ 8614264 - .incbin "baserom.gba", 0x614264, 0x4 + .4byte 0x00200000 gUnknown_08614268:: @ 8614268 - .incbin "baserom.gba", 0x614268, 0x4 + .4byte 0x00300000 gUnknown_0861426C:: @ 861426C - .incbin "baserom.gba", 0x61426c, 0x4 + .4byte 0x00400000 gUnknown_08614270:: @ 8614270 - .incbin "baserom.gba", 0x614270, 0x4 + .4byte 0x00500000 gUnknown_08614274:: @ 8614274 - .incbin "baserom.gba", 0x614274, 0x4 + .4byte 0x00600000 gUnknown_08614278:: @ 8614278 - .incbin "baserom.gba", 0x614278, 0x18 + .4byte 0x00700000 + +gUnknown_0861427C:: @ 861427C + .incbin "baserom.gba", 0x61427C, 0x14 gUnknown_08614290:: @ 8614290 .incbin "baserom.gba", 0x614290, 0x18 |