Karathan
/
source_of_the_sovereign
espejo de https://github.com/SBird1337/source_of_the_sovereign
Seguir 1
Destacar 0
Cuchillo 0
Código Incidencias Lanzamientos 0 Wiki Actividad
Explorar el Código

Grafiken, Scripts

dragonflysots hace 6 años
padre
498b74ae01
commit
cf1954c770
Se han modificado 11 ficheros con 143 adiciones y 22 borrados
Dividir vista Mostrar estadísticas de diff
  1. 8
    8
      data/overworld/overworld_data.s
  2. 104
    8
      data/overworld/overworld_frames.s
  3. 4
    4
      data/overworld/overworld_pal_table.s
  4. 1
    1
      sots-private
  5. 4
    0
      src/include/constants/pymap/npc_sprite_table4.h
  6. 4
    0
      src/include/constants/pymap/npc_sprite_table4.s
  7. 1
    0
      src/include/constants/pymap/story_flags.h
  8. 1
    0
      src/include/constants/pymap/story_flags.s
  9. 2
    1
      src/include/script/language.h
  10. 6
    0
      src/include/script/mugshot.h
  11. 8
    0
      src/interface/mugshot_table.s

+ 8
- 8
data/overworld/overworld_data.s Ver fichero 

@@ -5003,23 +5003,23 @@ ow_data_objekt_0026:
5003 5003
5004 5004 
 .align 2
5005 5005 
 ow_data_objekt_0027:
5006 
-.hword 0xFFFF, 0xC31B, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
5007 
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0027, 0x8231CFC
5006 
+.hword 0xFFFF, 0xC31B, 0x1102, 0x100, 0x10, 0x20, 0x0, 0x0
5007 
+.word 0x83A3710, 0x83A379C, 0x83A3368, ow_frames_objekt_0027, 0x8231CFC
5008 5008
5009 5009 
 .align 2
5010 5010 
 ow_data_objekt_0028:
5011 
-.hword 0xFFFF, 0xC31C, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
5012 
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0028, 0x8231CFC
5011 
+.hword 0xFFFF, 0xC31C, 0x1102, 0x100, 0x10, 0x20, 0x0, 0x0
5012 
+.word 0x83A3710, 0x83A379C, 0x83A3368, ow_frames_objekt_0028, 0x8231CFC
5013 5013
5014 5014 
 .align 2
5015 5015 
 ow_data_objekt_0029:
5016 
-.hword 0xFFFF, 0xC31D, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
5017 
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0029, 0x8231CFC
5016 
+.hword 0xFFFF, 0xC31D, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
5017 
+.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_objekt_0029, 0x8231CFC
5018 5018
5019 5019 
 .align 2
5020 5020 
 ow_data_objekt_0030:
5021 
-.hword 0xFFFF, 0xC31E, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
5022 
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0030, 0x8231CFC
5021 
+.hword 0xFFFF, 0xC31E, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
5022 
+.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_objekt_0030, 0x8231CFC
5023 5023
5024 5024 
 .align 2
5025 5025 
 ow_data_objekt_0031:

+ 104
- 8
data/overworld/overworld_frames.s Ver fichero 

@@ -16679,26 +16679,122 @@ ow_frames_objekt_0026:
16679 16679
16680 16680 
 .align 2
16681 16681 
 ow_frames_objekt_0027:
16682 
-.word ow_00000Tiles+(0*0x80)
16683 
-.hword 0x80
16682 
+.word ow_objekt_0027Tiles+(0*0x100)
16683 
+.hword 0x100
16684 
+.hword 0x0
16685 
+.word ow_objekt_0027Tiles+(0*0x100)
16686 
+.hword 0x100
16687 
+.hword 0x0
16688 
+.word ow_objekt_0027Tiles+(0*0x100)
16689 
+.hword 0x100
16690 
+.hword 0x0
16691 
+.word ow_objekt_0027Tiles+(1*0x100)
16692 
+.hword 0x100
16693 
+.hword 0x0
16694 
+.word ow_objekt_0027Tiles+(2*0x100)
16695 
+.hword 0x100
16696 
+.hword 0x0
16697 
+.word ow_objekt_0027Tiles+(1*0x100)
16698 
+.hword 0x100
16699 
+.hword 0x0
16700 
+.word ow_objekt_0027Tiles+(2*0x100)
16701 
+.hword 0x100
16702 
+.hword 0x0
16703 
+.word ow_objekt_0027Tiles+(1*0x100)
16704 
+.hword 0x100
16705 
+.hword 0x0
16706 
+.word ow_objekt_0027Tiles+(2*0x100)
16707 
+.hword 0x100
16684 16708 
 .hword 0x0
16685 16709
16686 16710 
 .align 2
16687 16711 
 ow_frames_objekt_0028:
16688 
-.word ow_00000Tiles+(0*0x80)
16689 
-.hword 0x80
16712 
+.word ow_objekt_0028Tiles+(0*0x100)
16713 
+.hword 0x100
16714 
+.hword 0x0
16715 
+.word ow_objekt_0028Tiles+(0*0x100)
16716 
+.hword 0x100
16717 
+.hword 0x0
16718 
+.word ow_objekt_0028Tiles+(0*0x100)
16719 
+.hword 0x100
16720 
+.hword 0x0
16721 
+.word ow_objekt_0028Tiles+(1*0x100)
16722 
+.hword 0x100
16723 
+.hword 0x0
16724 
+.word ow_objekt_0028Tiles+(2*0x100)
16725 
+.hword 0x100
16726 
+.hword 0x0
16727 
+.word ow_objekt_0028Tiles+(1*0x100)
16728 
+.hword 0x100
16729 
+.hword 0x0
16730 
+.word ow_objekt_0028Tiles+(2*0x100)
16731 
+.hword 0x100
16732 
+.hword 0x0
16733 
+.word ow_objekt_0028Tiles+(1*0x100)
16734 
+.hword 0x100
16735 
+.hword 0x0
16736 
+.word ow_objekt_0028Tiles+(2*0x100)
16737 
+.hword 0x100
16690 16738 
 .hword 0x0
16691 16739
16692 16740 
 .align 2
16693 16741 
 ow_frames_objekt_0029:
16694 
-.word ow_00000Tiles+(0*0x80)
16695 
-.hword 0x80
16742 
+.word ow_objekt_0029Tiles+(0*0x800)
16743 
+.hword 0x800
16744 
+.hword 0x0
16745 
+.word ow_objekt_0029Tiles+(0*0x800)
16746 
+.hword 0x800
16747 
+.hword 0x0
16748 
+.word ow_objekt_0029Tiles+(0*0x800)
16749 
+.hword 0x800
16750 
+.hword 0x0
16751 
+.word ow_objekt_0029Tiles+(1*0x800)
16752 
+.hword 0x800
16753 
+.hword 0x0
16754 
+.word ow_objekt_0029Tiles+(2*0x800)
16755 
+.hword 0x800
16756 
+.hword 0x0
16757 
+.word ow_objekt_0029Tiles+(1*0x800)
16758 
+.hword 0x800
16759 
+.hword 0x0
16760 
+.word ow_objekt_0029Tiles+(2*0x800)
16761 
+.hword 0x800
16762 
+.hword 0x0
16763 
+.word ow_objekt_0029Tiles+(1*0x800)
16764 
+.hword 0x800
16765 
+.hword 0x0
16766 
+.word ow_objekt_0029Tiles+(2*0x800)
16767 
+.hword 0x800
16696 16768 
 .hword 0x0
16697 16769
16698 16770 
 .align 2
16699 16771 
 ow_frames_objekt_0030:
16700 
-.word ow_00000Tiles+(0*0x80)
16701 
-.hword 0x80
16772 
+.word ow_objekt_0030Tiles+(0*0x800)
16773 
+.hword 0x800
16774 
+.hword 0x0
16775 
+.word ow_objekt_0030Tiles+(0*0x800)
16776 
+.hword 0x800
16777 
+.hword 0x0
16778 
+.word ow_objekt_0030Tiles+(0*0x800)
16779 
+.hword 0x800
16780 
+.hword 0x0
16781 
+.word ow_objekt_0030Tiles+(1*0x800)
16782 
+.hword 0x800
16783 
+.hword 0x0
16784 
+.word ow_objekt_0030Tiles+(2*0x800)
16785 
+.hword 0x800
16786 
+.hword 0x0
16787 
+.word ow_objekt_0030Tiles+(1*0x800)
16788 
+.hword 0x800
16789 
+.hword 0x0
16790 
+.word ow_objekt_0030Tiles+(2*0x800)
16791 
+.hword 0x800
16792 
+.hword 0x0
16793 
+.word ow_objekt_0030Tiles+(1*0x800)
16794 
+.hword 0x800
16795 
+.hword 0x0
16796 
+.word ow_objekt_0030Tiles+(2*0x800)
16797 
+.hword 0x800
16702 16798 
 .hword 0x0
16703 16799
16704 16800 
 .align 2

+ 4
- 4
data/overworld/overworld_pal_table.s Ver fichero 

@@ -799,10 +799,10 @@ ow_pal_table:
799 799 
 .word ow_objekt_0024Pal, 0xC318
800 800 
 .word ow_objekt_0025Pal, 0xC319
801 801 
 .word ow_objekt_0026Pal, 0xC31A
802 
-.word ow_00000Pal, 0xC31B
803 
-.word ow_00000Pal, 0xC31C
804 
-.word ow_00000Pal, 0xC31D
805 
-.word ow_00000Pal, 0xC31E
802 
+.word ow_objekt_0027Pal, 0xC31B
803 
+.word ow_objekt_0028Pal, 0xC31C
804 
+.word ow_objekt_0029Pal, 0xC31D
805 
+.word ow_objekt_0030Pal, 0xC31E
806 806 
 .word ow_00000Pal, 0xC31F
807 807 
 .word ow_00000Pal, 0xC320
808 808 
 .word ow_00000Pal, 0xC321

+ 1
- 1
sots-private 

@@ -1 +1 @@
1 
-Subproject commit 8057be3ad7779b535b009cd8b1588068a7a23270
1 
+Subproject commit 060dcea622fef123b09d4b2845c34487670a1a5e

+ 4
- 0
src/include/constants/pymap/npc_sprite_table4.h Ver fichero 

@@ -25,3 +25,7 @@
25 25 
 #define NPC_ZERSCHNEIDER_ANIMATION 0x18
26 26 
 #define NPC_HEILUNGSSTATUE 0x19
27 27 
 #define NPC_SEELENGEFAESSE 0x1a
28 
+#define NPC_ROTER_STEIN 0x1b
29 
+#define NPC_BLAUER_STEIN 0x1c
30 
+#define NPC_LATIAS_SEELE 0x1d
31 
+#define NPC_LATIOS_SEELE 0x1e

+ 4
- 0
src/include/constants/pymap/npc_sprite_table4.s Ver fichero 

@@ -25,3 +25,7 @@
25 25 
 .equ NPC_ZERSCHNEIDER_ANIMATION, 0x18
26 26 
 .equ NPC_HEILUNGSSTATUE, 0x19
27 27 
 .equ NPC_SEELENGEFAESSE, 0x1a
28 
+.equ NPC_ROTER_STEIN, 0x1b
29 
+.equ NPC_BLAUER_STEIN, 0x1c
30 
+.equ NPC_LATIAS_SEELE, 0x1d
31 
+.equ NPC_LATIOS_SEELE, 0x1e

+ 1
- 0
src/include/constants/pymap/story_flags.h Ver fichero 

@@ -38,3 +38,4 @@
38 38 
 #define FLAG_RDW_HIDE_OHNMAECHTIG_IDAN 0x525
39 39 
 #define FLAG_RDW_HIDE_ACHIM_IDAN_RIVAL 0x526
40 40 
 #define FLAG_RDW_HIDE_FIRNONTOR_FROSDEDJE 0x527
41 
+#define FLAG_HIDE_SEELENOWS_RDW_INNEN 0x528

+ 1
- 0
src/include/constants/pymap/story_flags.s Ver fichero 

@@ -38,3 +38,4 @@
38 38 
 .equ FLAG_RDW_HIDE_OHNMAECHTIG_IDAN, 0x525
39 39 
 .equ FLAG_RDW_HIDE_ACHIM_IDAN_RIVAL, 0x526
40 40 
 .equ FLAG_RDW_HIDE_FIRNONTOR_FROSDEDJE, 0x527
41 
+.equ FLAG_HIDE_SEELENOWS_RDW_INNEN, 0x528

+ 2
- 1
src/include/script/language.h Ver fichero 

@@ -283,7 +283,7 @@ setvar 0x5006 0x8
283 283 
 special 0x68
284 284 
 .endm
285 285
286 
-.macro mugmsg mugmsg_textpointer:req mugmsg_callstd:req mugmsg_sprite:req mugmsg_facing:req mugmsg_emot=0        mugmsg_sprite2=0 mugmsg_emot2=0
286 
+.macro mugmsg mugmsg_textpointer:req mugmsg_callstd:req mugmsg_sprite:req mugmsg_facing:req mugmsg_emot=0 mugmsg_sprite2=0 mugmsg_emot2=0
287 287 
 setvar 0x8000 0x0
288 288 
  .if \mugmsg_sprite==MUG_RIVALE
289 289 
      .if \mugmsg_facing==MUGFACE_LEFT
 
@@ -425,6 +425,7 @@ setvar OW_REPLACE_TO_VAR \changeowto_to
425 425 
 .word \call_address
426 426 
 .endm
427 427
428 
+
428 429 
 .macro goto goto_address:req
429 430 
 .byte 0x5
430 431 
 .word \goto_address

+ 6
- 0
src/include/script/mugshot.h Ver fichero 

@@ -132,4 +132,10 @@
132 132 
 /*--------------------------------------------------------------------------------------------------------------------------*/
133 133 
 #define MUG_DIANA                    0x5b
134 134
135 
+/*--------------------------------------------------------------------------------------------------------------------------*/
136 
+/* Diana - Anderes                                                                                                          */
137 
+/*--------------------------------------------------------------------------------------------------------------------------*/
138 
+#define MUG_LATIASSCHATTEN           0x5c
139 
+#define MUG_LATIOSSCHATTEN           0x5d
140 
+
135 141 
 #endif /* MUG_IDS_H */

+ 8
- 0
src/interface/mugshot_table.s Ver fichero 

@@ -226,3 +226,11 @@ mugshots:
226 226 
 @@-----------------------------------------------------------------------------------------------------------
227 227 
     .word mug_10_01Tiles
228 228 
     .word mug_10_01Pal
229 
+
230 
+@@-----------------------------------------------------------------------------------------------------------
231 
+@@ Anderes
232 
+@@-----------------------------------------------------------------------------------------------------------
233 
+    .word mug_latiasTiles
234 
+    .word mug_latiasPal
235 
+    .word mug_latiosTiles
236 
+    .word mug_latiosPal