summaryrefslogtreecommitdiff
path: root/data/animations
diff options
context:
space:
mode:
authoroctorock <79596758+octorock@users.noreply.github.com>2021-06-21 23:27:11 +0200
committeroctorock <79596758+octorock@users.noreply.github.com>2021-06-23 08:30:45 +0200
commit833d48b73520f70682a6196905a5139033e8d081 (patch)
tree0c267e095b87cad0e051b4b7cfb8ffb10e82836c /data/animations
parent57ab4df1a088c64e29644f6a26b13e76843ec7c0 (diff)
Add EU variant
Diffstat (limited to 'data/animations')
-rw-r--r--data/animations/enemy/waterDrop.s5
-rw-r--r--data/animations/npc/guard.s8
-rw-r--r--data/animations/object/objectB4.s5
3 files changed, 18 insertions, 0 deletions
diff --git a/data/animations/enemy/waterDrop.s b/data/animations/enemy/waterDrop.s
index 1ae0704d..f0267b36 100644
--- a/data/animations/enemy/waterDrop.s
+++ b/data/animations/enemy/waterDrop.s
@@ -4,7 +4,12 @@
.section .rodata
gUnk_080CD044:: @ 080CD044
+.ifdef EU
+ @ TODO only small differences
+ .incbin "baserom_eu.gba", 0x0CC76C, 0x0000025
+.else
.incbin "baserom.gba", 0x0CD044, 0x0000025
+.endif
gUnk_080CD069:: @ 080CD069
.incbin "baserom.gba", 0x0CD069, 0x0000007
diff --git a/data/animations/npc/guard.s b/data/animations/npc/guard.s
index 761eb951..ae7d7805 100644
--- a/data/animations/npc/guard.s
+++ b/data/animations/npc/guard.s
@@ -27,16 +27,24 @@ gUnk_0810F613:: @ 0810F613
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10F2D7, 0x0000007
.else
+.ifdef EU
+ .incbin "baserom_jp.gba", 0x10F2D7, 0x0000007
+.else
.incbin "baserom.gba", 0x10F613, 0x0000007
.endif
+.endif
gUnk_0810F61A:: @ 0810F61A
.ifdef JP
@ TODO only small differences
.incbin "baserom_jp.gba", 0x10F2DE, 0x000002E
.else
+.ifdef EU
+ .incbin "baserom_jp.gba", 0x10F2DE, 0x000002E
+.else
.incbin "baserom.gba", 0x10F61A, 0x000002E
.endif
+.endif
gUnk_0810F648:: @ 0810F648
.incbin "baserom.gba", 0x10F648, 0x000003A
diff --git a/data/animations/object/objectB4.s b/data/animations/object/objectB4.s
index 2faef082..9f995c2e 100644
--- a/data/animations/object/objectB4.s
+++ b/data/animations/object/objectB4.s
@@ -8,7 +8,12 @@ gUnk_08124B38:: @ 08124B38
.incbin "baserom.gba", 0x124B38, 0x0000071
gUnk_08124BA9:: @ 08124BA9
+.ifdef EU
+ @ TODO only small differences
+ .incbin "baserom_eu.gba", 0x1242F1, 0x0000053
+.else
.incbin "baserom.gba", 0x124BA9, 0x0000053
+.endif
gUnk_08124BFC:: @ 08124BFC
.4byte gUnk_08124B38