summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2019-12-02 20:42:30 -0500
committergarak <garakmon@gmail.com>2019-12-17 15:05:23 -0500
commitfc13e1ef6f0daa127b1ab0425d7cfcbed6aeafac (patch)
treec0c3eb0aa3aafbf7ef10812f167d8642232302c1
parentcdd882f3cc7eba04a547fba781af6436bd5ac72d (diff)
dump some palette tag tables
-rw-r--r--asm/event_object_movement.s12
-rw-r--r--data/event_object_movement.s251
2 files changed, 250 insertions, 13 deletions
diff --git a/asm/event_object_movement.s b/asm/event_object_movement.s
index ad074cacd..8f8b822a8 100644
--- a/asm/event_object_movement.s
+++ b/asm/event_object_movement.s
@@ -3042,7 +3042,7 @@ sub_805F4B0: @ 805F4B0
cmp r1, r0
beq _0805F4CE
lsls r0, r1, 3
- ldr r1, _0805F4D8 @ =gUnknown_83A5158
+ ldr r1, _0805F4D8 @ =gObjectEventSpritePalettes
adds r0, r1
bl sub_805F510
_0805F4CE:
@@ -3050,7 +3050,7 @@ _0805F4CE:
bx r0
.align 2, 0
_0805F4D4: .4byte 0x000011ff
-_0805F4D8: .4byte gUnknown_83A5158
+_0805F4D8: .4byte gObjectEventSpritePalettes
thumb_func_end sub_805F4B0
thumb_func_start sub_805F4DC
@@ -3117,7 +3117,7 @@ pal_patch_for_npc: @ 805F538
lsrs r4, 24
bl FindObjectEventPaletteIndexByTag
lsls r0, 24
- ldr r1, _0805F570 @ =gUnknown_83A5158
+ ldr r1, _0805F570 @ =gObjectEventSpritePalettes
lsrs r0, 21
adds r0, r1
ldr r0, [r0]
@@ -3134,7 +3134,7 @@ pal_patch_for_npc: @ 805F538
pop {r0}
bx r0
.align 2, 0
-_0805F570: .4byte gUnknown_83A5158
+_0805F570: .4byte gObjectEventSpritePalettes
thumb_func_end pal_patch_for_npc
thumb_func_start pal_patch_for_npc_range
@@ -3169,7 +3169,7 @@ FindObjectEventPaletteIndexByTag: @ 805F5A0
lsls r0, 16
lsrs r5, r0, 16
movs r2, 0
- ldr r0, _0805F5C8 @ =gUnknown_83A5158
+ ldr r0, _0805F5C8 @ =gObjectEventSpritePalettes
ldrh r1, [r0, 0x4]
ldr r3, _0805F5CC @ =0x000011ff
adds r4, r0, 0
@@ -3186,7 +3186,7 @@ _0805F5B8:
adds r0, r2, 0
b _0805F5E2
.align 2, 0
-_0805F5C8: .4byte gUnknown_83A5158
+_0805F5C8: .4byte gObjectEventSpritePalettes
_0805F5CC: .4byte 0x000011ff
_0805F5D0:
adds r0, r2, 0x1
diff --git a/data/event_object_movement.s b/data/event_object_movement.s
index d0d07db27..2f079fd25 100644
--- a/data/event_object_movement.s
+++ b/data/event_object_movement.s
@@ -547,7 +547,10 @@ gUnknown_8398688::
.incbin "graphics/object_events/fldeff_cut.gbapal"
gUnknown_83986A8:: @ 83986A8
- .incbin "baserom.gba", 0x3986A8, 0xCE0
+ .incbin "baserom.gba", 0x3986A8, 0x900
+
+gUnknown_8398FA8:: @ 8398FA8
+ .incbin "baserom.gba", 0x398FA8, 0x3E0
gUnknown_8399388:: @ 8399388
.incbin "baserom.gba", 0x399388, 0x908
@@ -5516,20 +5519,254 @@ gObjectEventGraphicsInfo_83A5134:: @ 83A5134
.4byte gSpriteImages_83A1CF0
.4byte gDummySpriteAffineAnimTable
-gUnknown_83A5158:: @ 83A5158
- .incbin "baserom.gba", 0x3A5158, 0xB0
+gObjectEventSpritePalettes:: @ 83A5158
+ .4byte gUnknown_836D828
+ .2byte 0x1103
+ .2byte 0x0000
+ .4byte gUnknown_836D848
+ .2byte 0x1104
+ .2byte 0x0000
+ .4byte gUnknown_836D868
+ .2byte 0x1105
+ .2byte 0x0000
+ .4byte gUnknown_836D888
+ .2byte 0x1106
+ .2byte 0x0000
+ .4byte gUnknown_836D8A8
+ .2byte 0x1107
+ .2byte 0x0000
+ .4byte gUnknown_836D8C8
+ .2byte 0x1108
+ .2byte 0x0000
+ .4byte gUnknown_836D8E8
+ .2byte 0x1109
+ .2byte 0x0000
+ .4byte gUnknown_836D908
+ .2byte 0x110a
+ .2byte 0x0000
+ .4byte gUnknown_835B968
+ .2byte 0x1100
+ .2byte 0x0000
+ .4byte gUnknown_835E968
+ .2byte 0x1101
+ .2byte 0x0000
+ .4byte gUnknown_835E988
+ .2byte 0x1102
+ .2byte 0x0000
+ .4byte gUnknown_8398008
+ .2byte 0x110b
+ .2byte 0x0000
+ .4byte gUnknown_8398028
+ .2byte 0x110c
+ .2byte 0x0000
+ .4byte gUnknown_835B968
+ .2byte 0x1110
+ .2byte 0x0000
+ .4byte gUnknown_835E968
+ .2byte 0x1111
+ .2byte 0x0000
+ .4byte gUnknown_8394EA8
+ .2byte 0x1113
+ .2byte 0x0000
+ .4byte gUnknown_8395AE8
+ .2byte 0x1115
+ .2byte 0x0000
+ .4byte gUnknown_83952C8
+ .2byte 0x1114
+ .2byte 0x0000
+ .4byte NULL
+ .2byte 0x0000
+ .2byte 0x0000
+
+gPlayerReflectionPaletteTags:: @ 83A51F0
+ .2byte 0x1101
+ .2byte 0x1101
+ .2byte 0x1101
+ .2byte 0x1101
+ .2byte 0x1111
+ .2byte 0x1111
+ .2byte 0x1111
+ .2byte 0x1111
+
+gUnknownPaletteTags_83A5200:: @ 83A5200
+ .2byte 0x1116
+ .2byte 0x1116
+ .2byte 0x1116
+ .2byte 0x1116
gUnknown_83A5208:: @ 83A5208
- .incbin "baserom.gba", 0x3A5208, 0x70
+ .2byte 0x1100
+ .2byte 0x0
+ .4byte gPlayerReflectionPaletteTags
+ .2byte 0x1110
+ .2byte 0x0
+ .4byte gPlayerReflectionPaletteTags
+ .2byte 0x1116
+ .2byte 0x0
+ .4byte gUnknownPaletteTags_83A5200
+ .2byte 0x11FF
+ .2byte 0x0
+ .4byte NULL
+
+gUnknownPaletteTags_83A5228:: @ 83A5228
+ .2byte 0x110c
+ .2byte 0x110c
+ .2byte 0x110c
+ .2byte 0x110c
+
+gUnknownPaletteTags_83A5230:: @ 83A5230
+ .2byte 0x110d
+ .2byte 0x110d
+ .2byte 0x110d
+ .2byte 0x110d
+
+gUnknownPaletteTags_83A5238::
+ .2byte 0x110e
+ .2byte 0x110e
+ .2byte 0x110e
+ .2byte 0x110e
+
+gUnknownPaletteTags_83A5240::
+ .2byte 0x1112
+ .2byte 0x1112
+ .2byte 0x1112
+ .2byte 0x1112
+
+gUnknownPaletteTags_83A5248::
+ .2byte 0x1113
+ .2byte 0x1113
+ .2byte 0x1113
+ .2byte 0x1113
+
+gUnknownPaletteTags_83A5250::
+ .2byte 0x1114
+ .2byte 0x1114
+ .2byte 0x1114
+ .2byte 0x1114
+
+gUnknownPaletteTags_83A5258::
+ .2byte 0x111b
+ .2byte 0x111b
+ .2byte 0x111b
+ .2byte 0x111b
+
+gUnknownPaletteTags_83A5260::
+ .2byte 0x1118
+ .2byte 0x1118
+ .2byte 0x1118
+ .2byte 0x1118
+
+gUnknownPaletteTags_83A5268::
+ .2byte 0x111a
+ .2byte 0x111a
+ .2byte 0x111a
+ .2byte 0x111a
+
+gUnknownPaletteTags_83A5270::
+ .2byte 0x1109
+ .2byte 0x1109
+ .2byte 0x1109
+ .2byte 0x1109
gUnknown_83A5278:: @ 83A5278
- .incbin "baserom.gba", 0x3A5278, 0xB8
+ .2byte 0x1100
+ .2byte 0x0
+ .4byte gPlayerReflectionPaletteTags
+ .2byte 0x1110
+ .2byte 0x0
+ .4byte gPlayerReflectionPaletteTags
+ .2byte 0x110b
+ .2byte 0x0
+ .4byte gUnknownPaletteTags_83A5228
+ .2byte 0x110d
+ .2byte 0x0
+ .4byte gUnknownPaletteTags_83A5230
+ .2byte 0x110e
+ .2byte 0x0
+ .4byte gUnknownPaletteTags_83A5238
+ .2byte 0x1112
+ .2byte 0x0
+ .4byte gUnknownPaletteTags_83A5240
+ .2byte 0x1113
+ .2byte 0x0
+ .4byte gUnknownPaletteTags_83A5248
+ .2byte 0x1114
+ .2byte 0x0
+ .4byte gUnknownPaletteTags_83A5250
+ .2byte 0x1117
+ .2byte 0x0
+ .4byte gUnknownPaletteTags_83A5260
+ .2byte 0x1119
+ .2byte 0x0
+ .4byte gUnknownPaletteTags_83A5268
+ .2byte 0x1105
+ .2byte 0x0
+ .4byte gUnknownPaletteTags_83A5270
+ .2byte 0x111b
+ .2byte 0x0
+ .4byte gUnknownPaletteTags_83A5258
+ .2byte 0x11ff
+ .2byte 0x0
+ .4byte NULL
+
+gUnknownPaletteTags_83A52E0::
+ .2byte 0x1100
+ .2byte 0x1101
+ .2byte 0x1103
+ .2byte 0x1104
+ .2byte 0x1105
+ .2byte 0x1106
+ .2byte 0x1107
+ .2byte 0x1108
+ .2byte 0x1109
+ .2byte 0x110a
+
+gUnknownPaletteTags_83A52F4::
+ .2byte 0x1100
+ .2byte 0x1110
+ .2byte 0x1103
+ .2byte 0x1104
+ .2byte 0x1105
+ .2byte 0x1106
+ .2byte 0x1107
+ .2byte 0x1108
+ .2byte 0x1109
+ .2byte 0x110a
+
+gUnknownPaletteTags_83A5308::
+ .2byte 0x1100
+ .2byte 0x1101
+ .2byte 0x1103
+ .2byte 0x1104
+ .2byte 0x1105
+ .2byte 0x1106
+ .2byte 0x1107
+ .2byte 0x1108
+ .2byte 0x1109
+ .2byte 0x110a
+
+gUnknownPaletteTags_83A531C::
+ .2byte 0x1100
+ .2byte 0x1101
+ .2byte 0x1103
+ .2byte 0x1104
+ .2byte 0x1105
+ .2byte 0x1106
+ .2byte 0x1107
+ .2byte 0x1108
+ .2byte 0x1109
+ .2byte 0x110a
gUnknown_83A5330:: @ 83A5330
- .incbin "baserom.gba", 0x3A5330, 0x10
+ .4byte gUnknownPaletteTags_83A52E0
+ .4byte gUnknownPaletteTags_83A52F4
+ .4byte gUnknownPaletteTags_83A5308
+ .4byte gUnknownPaletteTags_83A531C
gUnknown_83A5340::
- .incbin "baserom.gba", 0x3A5340, 0x8
+ .4byte gUnknown_8398FA8
+ .2byte 0x1004
+ .2byte 0x0
gUnknown_83A5348:: @ 83A5348
.incbin "baserom.gba", 0x3A5348, 0xB90