diff options
| author | YamaArashi <shadow962@live.com> | 2016-10-24 00:28:02 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-10-24 00:28:02 -0700 |
| commit | 9211a3702e571de49b1b61fcba822746b3c28743 (patch) | |
| tree | 7ea71e491c6a52c83096f80d4a5049b21ee2b6ab | |
| parent | 1927edefd9fdb95fad098c8a7baf49f721dee1fd (diff) | |
roamer location data
| -rw-r--r-- | asm/rom_81258BC.s | 14 | ||||
| -rw-r--r-- | data/data2.s | 24 |
2 files changed, 29 insertions, 9 deletions
diff --git a/asm/rom_81258BC.s b/asm/rom_81258BC.s index 351a38932..afcee9c10 100644 --- a/asm/rom_81258BC.s +++ b/asm/rom_81258BC.s @@ -19053,7 +19053,7 @@ sub_8134240: @ 8134240 mov r0, r8 strb r0, [r4] bl Random - ldr r5, _08134308 @ =gUnknown_08402E80 + ldr r5, _08134308 @ =gRoamerLocations lsls r0, 16 lsrs r0, 16 movs r1, 0x14 @@ -19079,7 +19079,7 @@ _sub_8134240_Latias: .4byte 407 .endif _08134300: .4byte gSaveBlock1 + 0x3144 _08134304: .4byte gRoamerLocation -_08134308: .4byte gUnknown_08402E80 +_08134308: .4byte gRoamerLocations thumb_func_end sub_8134240 thumb_func_start sub_813430C @@ -19124,7 +19124,7 @@ sub_8134348: @ 8134348 beq _08134380 ldr r0, _0813438C @ =gRoamerLocation strb r1, [r0] - ldr r5, _08134390 @ =gUnknown_08402E80 + ldr r5, _08134390 @ =gRoamerLocations adds r4, r0, 0 _0813435C: bl Random @@ -19150,7 +19150,7 @@ _08134380: .align 2, 0 _08134388: .4byte gSaveBlock1 + 0x3144 _0813438C: .4byte gRoamerLocation -_08134390: .4byte gUnknown_08402E80 +_08134390: .4byte gRoamerLocations thumb_func_end sub_8134348 thumb_func_start sub_8134394 @@ -19172,7 +19172,7 @@ _081343AE: cmp r0, 0 beq _08134416 ldr r7, _08134400 @ =gRoamerLocation - ldr r3, _08134404 @ =gUnknown_08402E80 + ldr r3, _08134404 @ =gRoamerLocations _081343BA: lsls r0, r4, 1 adds r0, r4 @@ -19182,7 +19182,7 @@ _081343BA: ldrb r1, [r1] cmp r0, r1 bne _0813440C - ldr r6, _08134404 @ =gUnknown_08402E80 + ldr r6, _08134404 @ =gRoamerLocations adds r5, r2, 0x1 ldr r4, _08134408 @ =gUnknown_020392FC _081343D0: @@ -19210,7 +19210,7 @@ _081343F4: .align 2, 0 _081343FC: .4byte gSaveBlock1 + 0x3144 _08134400: .4byte gRoamerLocation -_08134404: .4byte gUnknown_08402E80 +_08134404: .4byte gRoamerLocations _08134408: .4byte gUnknown_020392FC _0813440C: adds r0, r4, 0x1 diff --git a/data/data2.s b/data/data2.s index 6d4e3998d..a4b0bed4b 100644 --- a/data/data2.s +++ b/data/data2.s @@ -26887,8 +26887,28 @@ gDecorationInventories:: @ 8402E40 .4byte gSaveBlock1 + 0x2704, 40 @ DOLL .4byte gSaveBlock1 + 0x272C, 10 @ CUSHION -gUnknown_08402E80:: @ 8402E80 - .incbin "baserom.gba", 0x00402e80, 0x80 +gRoamerLocations:: @ 8402E80 + .byte 0x19,0x1A,0x20,0x21,0x31,0xFF + .byte 0x1A,0x19,0x20,0x21,0xFF,0xFF + .byte 0x20,0x1A,0x19,0x21,0xFF,0xFF + .byte 0x21,0x20,0x19,0x1A,0x22,0x26 + .byte 0x22,0x21,0x23,0xFF,0xFF,0xFF + .byte 0x23,0x22,0x24,0xFF,0xFF,0xFF + .byte 0x24,0x23,0x25,0x26,0xFF,0xFF + .byte 0x25,0x24,0x26,0xFF,0xFF,0xFF + .byte 0x26,0x25,0x21,0xFF,0xFF,0xFF + .byte 0x27,0x24,0x28,0x29,0xFF,0xFF + .byte 0x28,0x27,0x2A,0xFF,0xFF,0xFF + .byte 0x29,0x27,0x2A,0xFF,0xFF,0xFF + .byte 0x2A,0x28,0x29,0x2B,0xFF,0xFF + .byte 0x2B,0x2A,0x2C,0xFF,0xFF,0xFF + .byte 0x2C,0x2B,0x2D,0xFF,0xFF,0xFF + .byte 0x2D,0x2C,0x2E,0xFF,0xFF,0xFF + .byte 0x2E,0x2D,0x2F,0xFF,0xFF,0xFF + .byte 0x2F,0x2E,0x30,0xFF,0xFF,0xFF + .byte 0x30,0x2F,0x31,0xFF,0xFF,0xFF + .byte 0x31,0x30,0x19,0xFF,0xFF,0xFF + .byte 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF @ 8402F00 .include "data/battle_tower/trainers.s" |