diff options
| author | YamaArashi <shadow962@live.com> | 2016-08-31 19:43:52 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-08-31 19:43:52 -0700 |
| commit | 7ba21507a66380ba590c7265ad63d85742a93f8b (patch) | |
| tree | c196193b77f7f089de22be83a25efa5a84008777 | |
| parent | 33f5cd7f813dd5239fc2e699e5bc62360dea72a6 (diff) | |
more cable car incbins
| -rw-r--r-- | asm/rom5.s | 6 | ||||
| -rw-r--r-- | data/data2.s | 22 |
2 files changed, 17 insertions, 11 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 9c35c91c0..3a61e52c5 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -347345,10 +347345,10 @@ _081241BE: bl sub_807C9B4 b _0812431E .align 2, 0 -_0812422C: .4byte gUnknown_08401D88 +_0812422C: .4byte gCableCarPlayerGraphicsIDs _08124230: .4byte gMtChimneyHikerGraphicsIDs -_08124234: .4byte gUnknown_08401D8E -_08124238: .4byte gUnknown_08401D96 +_08124234: .4byte gMtChimneyHikerCoords +_08124238: .4byte gMtChimneyHikerMovementDelayTable _0812423C: .4byte gUnknown_08401D9C _08124240: .4byte 0x0202e8cc _08124244: .4byte gSaveBlock2 diff --git a/data/data2.s b/data/data2.s index 18b14647d..757e3c0ba 100644 --- a/data/data2.s +++ b/data/data2.s @@ -25871,20 +25871,26 @@ gSpriteTemplate_8401D58:: @ 8401D58 gSpriteTemplate_8401D70:: @ 8401D70 spr_template 3, 1, gOamData_8401D38, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, nullsub_76 -gUnknown_08401D88:: @ 8401D88 - .incbin "baserom.gba", 0x00401d88, 0x2 +gCableCarPlayerGraphicsIDs:: @ 8401D88 + .byte MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL + .byte MAP_OBJ_GFX_RIVAL_MAY_NORMAL gMtChimneyHikerGraphicsIDs:: @ 8401D8A .byte MAP_OBJ_GFX_HIKER .byte MAP_OBJ_GFX_CAMPER .byte MAP_OBJ_GFX_PICNICKER - .byte MAP_OBJ_GFX_POOCHYENA + .byte MAP_OBJ_GFX_POOCHYENA @ not used -gUnknown_08401D8E:: @ 8401D8E - .incbin "baserom.gba", 0x00401d8e, 0x8 - -gUnknown_08401D96:: @ 8401D96 - .incbin "baserom.gba", 0x00401d96, 0x4 + .align 1 +gMtChimneyHikerCoords:: @ 8401D8E + .2byte 0, 80 + .2byte 240, 146 + +gMtChimneyHikerMovementDelayTable:: @ 8401D96 + .byte 0 + .byte 60 + .byte 120 + .byte 170 .align 2 gUnknown_08401D9C:: @ 8401D9C |