diff options
| -rw-r--r-- | asm/rom.s | 64 | ||||
| -rw-r--r-- | data/data2.s | 42 |
2 files changed, 68 insertions, 38 deletions
@@ -367,7 +367,7 @@ _080004D0: .align 2 _08000518: .4byte IntrMain _0800051C: .4byte 0x03001c00 -_08000520: .4byte gUnknown_081E2824 +_08000520: .4byte gIntrTableTemplate _08000524: .4byte 0x03001bc0 _08000528: .4byte 0x040000d4 _0800052C: .4byte 0x84000200 @@ -413,8 +413,8 @@ SetSerialCallback: ; 8000564 _0800056C: .4byte 0x03001770 thumb_func_end SetSerialCallback - thumb_func_start VBlankInterruptHandler -VBlankInterruptHandler: ; 8000570 + thumb_func_start VBlankIntr +VBlankIntr: ; 8000570 push {r4-r6,lr} ldr r0, _080005D4 ldrb r0, [r0] @@ -467,7 +467,7 @@ _080005DC: .4byte 0x03001770 _080005E0: .4byte 0x03002400 _080005E4: .4byte 0x03005fd0 _080005E8: .4byte 0x03007ff8 - thumb_func_end VBlankInterruptHandler + thumb_func_end VBlankIntr thumb_func_start StartFlashMemoryTimer StartFlashMemoryTimer: ; 80005EC @@ -560,10 +560,10 @@ _08000688: .4byte 0x03001770 _0800068C: .4byte 0x03007ff8 thumb_func_end SerialIntr - thumb_func_start nullsub_35 -nullsub_35: ; 8000690 + thumb_func_start IntrDummy +IntrDummy: ; 8000690 bx lr - thumb_func_end nullsub_35 + thumb_func_end IntrDummy thumb_func_start WaitForVBlank WaitForVBlank: ; 8000694 @@ -15358,8 +15358,8 @@ _080072B2: _080072EC: .4byte 0x03002a00 _080072F0: .4byte 0x02024ea4 _080072F4: .4byte 0x03002b74 -_080072F8: .4byte gUnknown_081E280D -_080072FC: .4byte gUnknown_081E280C +_080072F8: .4byte gGameLanguage +_080072FC: .4byte gGameVersion thumb_func_end sub_8007280 thumb_func_start sub_8007300 @@ -28609,7 +28609,7 @@ _0800D7F8: ldr r0, _0800D834 b _0800DA66 .align 2 -_0800D820: .4byte gUnknown_081E280C +_0800D820: .4byte gGameVersion _0800D824: .4byte gUnknown_08E61BE8 _0800D828: .4byte 0x06008000 _0800D82C: .4byte gUnknown_08E62228 @@ -29878,7 +29878,7 @@ _0800E300: ldr r0, _0800E32C b _0800E3D2 .align 2 -_0800E320: .4byte gUnknown_081E280C +_0800E320: .4byte gGameVersion _0800E324: .4byte gUnknown_08E66D74 _0800E328: .4byte 0x06004000 _0800E32C: .4byte gUnknown_08E67590 @@ -30056,7 +30056,7 @@ _0800E492: .align 2 _0800E4A8: .4byte 0x020239f8 _0800E4AC: .4byte 0x00000902 -_0800E4B0: .4byte gUnknown_081E280C +_0800E4B0: .4byte gGameVersion _0800E4B4: .4byte gUnknown_08E61BE8 _0800E4B8: ldr r0, _0800E4BC @@ -30187,7 +30187,7 @@ _0800E59E: .align 2 _0800E5B4: .4byte 0x020239f8 _0800E5B8: .4byte 0x00000902 -_0800E5BC: .4byte gUnknown_081E280C +_0800E5BC: .4byte gGameVersion _0800E5C0: .4byte gUnknown_08E62228 _0800E5C4: ldr r0, _0800E5C8 @@ -30319,7 +30319,7 @@ _0800E6AA: .align 2 _0800E6C0: .4byte 0x020239f8 _0800E6C4: .4byte 0x00000902 -_0800E6C8: .4byte gUnknown_081E280C +_0800E6C8: .4byte gGameVersion _0800E6CC: .4byte gUnknown_08E636E0 _0800E6D0: ldr r0, _0800E6D4 @@ -105789,7 +105789,7 @@ _08034C1C: ands r0, r1 cmp r0, 0 beq _08034C34 - bl sub_8134C74 + bl get_trainer_class_pic_index b _08034C42 .align 2 _08034C30: .4byte 0x020239f8 @@ -106000,7 +106000,7 @@ _08034DE0: ands r0, r1 cmp r0, 0 beq _08034DF8 - bl sub_8134C74 + bl get_trainer_class_pic_index b _08034E06 .align 2 _08034DF4: .4byte 0x020239f8 @@ -117401,10 +117401,10 @@ _0803A8D4: b _0803AA9C .align 2 _0803AA00: .4byte 0x02024ea4 -_0803AA04: .4byte gUnknown_081E280D +_0803AA04: .4byte gGameLanguage _0803AA08: .4byte gBaseStats _0803AA0C: .4byte gExperienceTables -_0803AA10: .4byte gUnknown_081E280C +_0803AA10: .4byte gGameVersion _0803AA14: bl GenerateRandomNumber lsls r0, 16 @@ -266840,7 +266840,7 @@ sub_8081BF8: ; 8081BF8 _08081C20: .4byte 0x03001770 _08081C24: .4byte sub_8081CEC _08081C28: .4byte 0x020239f8 -_08081C2C: .4byte gUnknown_081E280C +_08081C2C: .4byte gGameVersion _08081C30: .4byte 0x000001cf _08081C34: ldr r1, _08081C4C @@ -469019,7 +469019,7 @@ _080E43E0: ldr r0, _080E43FC b _080E4408 .align 2 -_080E43F8: .4byte gUnknown_081E280C +_080E43F8: .4byte gGameVersion _080E43FC: .4byte task00_battle_intro_80BC6C8 _080E4400: ldr r1, _080E4434 @@ -594607,7 +594607,7 @@ _08121768: ands r0, r1 cmp r0, 0 beq _08121788 - bl sub_8134CE0 + bl get_trainer_class_name_index lsls r0, 24 lsrs r0, 24 movs r1, 0xD @@ -594671,7 +594671,7 @@ _081217EC: cmp r0, 0 beq _08121808 mov r0, sp - bl sub_8134D4C + bl get_trainer_name mov r4, sp b _081219E6 .align 2 @@ -634903,8 +634903,8 @@ _08134C5E: _08134C70: .4byte 0x02024ea4 thumb_func_end sub_8134AC0 - thumb_func_start sub_8134C74 -sub_8134C74: ; 8134C74 + thumb_func_start get_trainer_class_pic_index +get_trainer_class_pic_index: ; 8134C74 push {lr} ldr r3, _08134C90 ldr r0, _08134C94 @@ -634956,10 +634956,10 @@ _08134CD2: .align 2 _08134CD8: .4byte gTrainerClassToPicIndex _08134CDC: .4byte gUnknown_08402F00 - thumb_func_end sub_8134C74 + thumb_func_end get_trainer_class_pic_index - thumb_func_start sub_8134CE0 -sub_8134CE0: ; 8134CE0 + thumb_func_start get_trainer_class_name_index +get_trainer_class_name_index: ; 8134CE0 push {lr} ldr r3, _08134CFC ldr r0, _08134D00 @@ -635011,10 +635011,10 @@ _08134D40: bx r1 .align 2 _08134D48: .4byte gTrainerClassToNameIndex - thumb_func_end sub_8134CE0 + thumb_func_end get_trainer_class_name_index - thumb_func_start sub_8134D4C -sub_8134D4C: ; 8134D4C + thumb_func_start get_trainer_name +get_trainer_name: ; 8134D4C push {r4,r5,lr} adds r4, r0, 0 ldr r2, _08134D74 @@ -635086,7 +635086,7 @@ _08134DC8: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_8134D4C + thumb_func_end get_trainer_name thumb_func_start sub_8134DD4 sub_8134DD4: ; 8134DD4 @@ -636997,7 +636997,7 @@ sub_8135CFC: ; 8135CFC push {r4,lr} ldr r4, _08135D34 adds r0, r4, 0 - bl sub_8134D4C + bl get_trainer_name ldr r2, _08135D38 adds r0, r2, 0 adds r0, 0x58 diff --git a/data/data2.s b/data/data2.s index 6d10081bb..b1ffb52af 100644 --- a/data/data2.s +++ b/data/data2.s @@ -2,14 +2,44 @@ .align 2 -gUnknown_081E280C: ; 81E280C - .incbin "baserom.gba", 0x001e280c, 0x1 +gGameVersion: ; 81E280C + .byte 2 ; Ruby -gUnknown_081E280D: ; 81E280D - .incbin "baserom.gba", 0x001e280d, 0x17 +gGameLanguage: ; 81E280D + .byte 2 ; English -gUnknown_081E2824: ; 81E2824 - .incbin "baserom.gba", 0x001e2824, 0x75 + .align 2 + +; compile date/time + .asciz "2002 10 15 20:34" + + .align 2 + +gIntrTableTemplate: ; 81E2824 + .4byte SerialIntr + .4byte Timer3Intr + .4byte HBlankIntr + .4byte VBlankIntr + .4byte VCountIntr + .4byte IntrDummy + .4byte IntrDummy + .4byte IntrDummy + .4byte IntrDummy + .4byte IntrDummy + .4byte IntrDummy + .4byte IntrDummy + .4byte IntrDummy + .4byte IntrDummy + +; Unreferenced error message. +; It means "The DMA transfer request table has exceeded its limit." + .charmapstr "DMA OVER{next}" + .charmapstr "DMAてんそう{next}" + .charmapstr "リクエストテ-ブルが{next}" + .charmapstr "オ-バ-しました$" + +; 81E2881 + .incbin "baserom.gba", 0x1E2881, 0x18 gUnknown_081E2899: ; 81E2899 .incbin "baserom.gba", 0x001e2899, 0x1b |