Sfoglia il codice sorgente

update mugshot rival stuff

SBird1337 7 anni fa
parent
commit
339711932d
3 ha cambiato i file con 11 aggiunte e 4 eliminazioni
  1. 1
    1
      sots-private
  2. 7
    2
      src/include/script_language.h
  3. 3
    1
      src/interface/mugshot_table.s

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 6f9ef909f235f4f3b14b8269f37153ce5f1f2709
1
+Subproject commit 4824651293b7e65aab39bff4896bea38ada05a84

+ 7
- 2
src/include/script_language.h Vedi File

@@ -182,8 +182,13 @@ setvar MUGHSOT_1_TABLE 0x0
182 182
 .endm
183 183
 
184 184
 .macro mugrival mugrival_textpointer:req mugrival_callstd:req mugrival_facing:req
185
-setvar 0x8000 \mugrival_facing
186
-call scr_mugrival
185
+.if \mugrival_facing==MUGFACE_LEFT
186
+    call scr_mugrival_left
187
+.endif
188
+.if \mugrival_facing==MUGFACE_RIGHT
189
+    call scr_mugrival_right
190
+.endif
191
+
187 192
 msgbox \mugrival_textpointer \mugrival_callstd
188 193
 setvar MUGHSOT_1_TABLE 0x0
189 194
 .endm

+ 3
- 1
src/interface/mugshot_table.s Vedi File

@@ -2,6 +2,8 @@
2 2
 .thumb
3 3
 .section .rodata
4 4
 
5
+.align 2
6
+
5 7
 .global mugshots
6 8
 mugshots:
7 9
 .word mug_00Tiles
@@ -32,4 +34,4 @@ mugshots:
32 34
 .word mug_08Pal
33 35
 
34 36
 .word mug_09Tiles
35
-.word mug_09Pal
37
+.word mug_09Pal