Refresh 2

assets/demo_data.s

@@ -3,25 +3,27 @@
 .section .data
 
 .macro demo name
-.word (\name - gDemoInputs), (\name\()_end - \name)
+    .word32 (\name - gDemoInputs)
+    .word32 (\name\()_end - \name)
 .endm
 
 # Whomp's Fortress has the wrong size. The original entries probably manually
 # input the sizes, but we opt for macros for cleanliness.
 .macro demo2 name
-.word (\name - gDemoInputs), ((\name\()_end + 0x170) - \name)
+    .word32 (\name - gDemoInputs)
+    .word32 ((\name\()_end + 0x170) - \name)
 .endm
 
 .macro demofile name
-\name:
-.incbin "assets/demos/\name\().bin"
-\name\()_end:
+    \name:
+    .incbin "assets/demos/\name\().bin"
+    \name\()_end:
 .endm
 
 glabel gDemoInputs
-.word (demo_entry_end - demo_entry_start) / 8 # number of entries
+.word32 (demo_entry_end - demo_entry_start) / 8 # number of entries
+.word 0
 
-.align 3, 0x00
 demo_entry_start:
 .ifdef VERSION_US
 demo  bitdw # Bowser in the Dark World

assets/mario_anim_data.s

@@ -1,6 +1,6 @@
 .include "macros.inc"
 
-.data
+.section .data
 
 .macro anim_file name
     .balign 4, 0
@@ -8,19 +8,20 @@
 .endm
 
 .macro anim_entry name
-    .word (\name - gMarioAnims), (\name\()_end - \name)
+    .word32 (\name - gMarioAnims)
+    .word32 (\name\()_end - \name)
 .endm
 
 .macro anim_header name, flags, unk02, unk04, unk06, length, numnodes
     \name:
     .hword \flags, \unk02, \unk04, \unk06, \length, \numnodes
-    .word \name\()_values  - \name
-    .word \name\()_indices - \name
-    .word \name\()_end     - \name
+    .word32 \name\()_values  - \name
+    .word32 \name\()_indices - \name
+    .word32 \name\()_end     - \name
 .endm
 
 glabel gMarioAnims
-.word (anim_table_end - anim_table_start) / 8 # number of entries
+.word32 (anim_table_end - anim_table_start) / 8 # number of entries
 .word 0
 
 anim_table_start: