Grafiken, Scripts

data/overworld/overworld_data.s

@@ -5003,23 +5003,23 @@ ow_data_objekt_0026:
 
 .align 2
 ow_data_objekt_0027:
-.hword 0xFFFF, 0xC31B, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0027, 0x8231CFC
+.hword 0xFFFF, 0xC31B, 0x1102, 0x100, 0x10, 0x20, 0x0, 0x0
+.word 0x83A3710, 0x83A379C, 0x83A3368, ow_frames_objekt_0027, 0x8231CFC
 
 .align 2
 ow_data_objekt_0028:
-.hword 0xFFFF, 0xC31C, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0028, 0x8231CFC
+.hword 0xFFFF, 0xC31C, 0x1102, 0x100, 0x10, 0x20, 0x0, 0x0
+.word 0x83A3710, 0x83A379C, 0x83A3368, ow_frames_objekt_0028, 0x8231CFC
 
 .align 2
 ow_data_objekt_0029:
-.hword 0xFFFF, 0xC31D, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0029, 0x8231CFC
+.hword 0xFFFF, 0xC31D, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
+.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_objekt_0029, 0x8231CFC
 
 .align 2
 ow_data_objekt_0030:
-.hword 0xFFFF, 0xC31E, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0030, 0x8231CFC
+.hword 0xFFFF, 0xC31E, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
+.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_objekt_0030, 0x8231CFC
 
 .align 2
 ow_data_objekt_0031:

data/overworld/overworld_frames.s

@@ -16679,26 +16679,122 @@ ow_frames_objekt_0026:
 
 .align 2
 ow_frames_objekt_0027:
-.word ow_00000Tiles+(0*0x80)
-.hword 0x80
+.word ow_objekt_0027Tiles+(0*0x100)
+.hword 0x100
+.hword 0x0
+.word ow_objekt_0027Tiles+(0*0x100)
+.hword 0x100
+.hword 0x0
+.word ow_objekt_0027Tiles+(0*0x100)
+.hword 0x100
+.hword 0x0
+.word ow_objekt_0027Tiles+(1*0x100)
+.hword 0x100
+.hword 0x0
+.word ow_objekt_0027Tiles+(2*0x100)
+.hword 0x100
+.hword 0x0
+.word ow_objekt_0027Tiles+(1*0x100)
+.hword 0x100
+.hword 0x0
+.word ow_objekt_0027Tiles+(2*0x100)
+.hword 0x100
+.hword 0x0
+.word ow_objekt_0027Tiles+(1*0x100)
+.hword 0x100
+.hword 0x0
+.word ow_objekt_0027Tiles+(2*0x100)
+.hword 0x100
 .hword 0x0
 
 .align 2
 ow_frames_objekt_0028:
-.word ow_00000Tiles+(0*0x80)
-.hword 0x80
+.word ow_objekt_0028Tiles+(0*0x100)
+.hword 0x100
+.hword 0x0
+.word ow_objekt_0028Tiles+(0*0x100)
+.hword 0x100
+.hword 0x0
+.word ow_objekt_0028Tiles+(0*0x100)
+.hword 0x100
+.hword 0x0
+.word ow_objekt_0028Tiles+(1*0x100)
+.hword 0x100
+.hword 0x0
+.word ow_objekt_0028Tiles+(2*0x100)
+.hword 0x100
+.hword 0x0
+.word ow_objekt_0028Tiles+(1*0x100)
+.hword 0x100
+.hword 0x0
+.word ow_objekt_0028Tiles+(2*0x100)
+.hword 0x100
+.hword 0x0
+.word ow_objekt_0028Tiles+(1*0x100)
+.hword 0x100
+.hword 0x0
+.word ow_objekt_0028Tiles+(2*0x100)
+.hword 0x100
 .hword 0x0
 
 .align 2
 ow_frames_objekt_0029:
-.word ow_00000Tiles+(0*0x80)
-.hword 0x80
+.word ow_objekt_0029Tiles+(0*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0029Tiles+(0*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0029Tiles+(0*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0029Tiles+(1*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0029Tiles+(2*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0029Tiles+(1*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0029Tiles+(2*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0029Tiles+(1*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0029Tiles+(2*0x800)
+.hword 0x800
 .hword 0x0
 
 .align 2
 ow_frames_objekt_0030:
-.word ow_00000Tiles+(0*0x80)
-.hword 0x80
+.word ow_objekt_0030Tiles+(0*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0030Tiles+(0*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0030Tiles+(0*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0030Tiles+(1*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0030Tiles+(2*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0030Tiles+(1*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0030Tiles+(2*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0030Tiles+(1*0x800)
+.hword 0x800
+.hword 0x0
+.word ow_objekt_0030Tiles+(2*0x800)
+.hword 0x800
 .hword 0x0
 
 .align 2

data/overworld/overworld_pal_table.s

@@ -799,10 +799,10 @@ ow_pal_table:
 .word ow_objekt_0024Pal, 0xC318
 .word ow_objekt_0025Pal, 0xC319
 .word ow_objekt_0026Pal, 0xC31A
-.word ow_00000Pal, 0xC31B
-.word ow_00000Pal, 0xC31C
-.word ow_00000Pal, 0xC31D
-.word ow_00000Pal, 0xC31E
+.word ow_objekt_0027Pal, 0xC31B
+.word ow_objekt_0028Pal, 0xC31C
+.word ow_objekt_0029Pal, 0xC31D
+.word ow_objekt_0030Pal, 0xC31E
 .word ow_00000Pal, 0xC31F
 .word ow_00000Pal, 0xC320
 .word ow_00000Pal, 0xC321

sots-private

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

src/include/constants/pymap/npc_sprite_table4.h

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

src/include/constants/pymap/npc_sprite_table4.s

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

src/include/constants/pymap/story_flags.h

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

src/include/constants/pymap/story_flags.s

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

src/include/script/language.h

@@ -283,7 +283,7 @@ setvar 0x5006 0x8
 special 0x68
 .endm
 
-.macro mugmsg mugmsg_textpointer:req mugmsg_callstd:req mugmsg_sprite:req mugmsg_facing:req mugmsg_emot=0        mugmsg_sprite2=0 mugmsg_emot2=0
+.macro mugmsg mugmsg_textpointer:req mugmsg_callstd:req mugmsg_sprite:req mugmsg_facing:req mugmsg_emot=0 mugmsg_sprite2=0 mugmsg_emot2=0
 setvar 0x8000 0x0
  .if \mugmsg_sprite==MUG_RIVALE
      .if \mugmsg_facing==MUGFACE_LEFT
@@ -425,6 +425,7 @@ setvar OW_REPLACE_TO_VAR \changeowto_to
 .word \call_address
 .endm
 
+
 .macro goto goto_address:req
 .byte 0x5
 .word \goto_address

src/include/script/mugshot.h

@@ -132,4 +132,10 @@
 /*--------------------------------------------------------------------------------------------------------------------------*/
 #define MUG_DIANA                    0x5b
 
+/*--------------------------------------------------------------------------------------------------------------------------*/
+/* Diana - Anderes                                                                                                          */
+/*--------------------------------------------------------------------------------------------------------------------------*/
+#define MUG_LATIASSCHATTEN           0x5c
+#define MUG_LATIOSSCHATTEN           0x5d
+
 #endif /* MUG_IDS_H */

src/interface/mugshot_table.s

@@ -226,3 +226,11 @@ mugshots:
 @@-----------------------------------------------------------------------------------------------------------
     .word mug_10_01Tiles
     .word mug_10_01Pal
+
+@@-----------------------------------------------------------------------------------------------------------
+@@ Anderes
+@@-----------------------------------------------------------------------------------------------------------
+    .word mug_latiasTiles
+    .word mug_latiasPal
+    .word mug_latiosTiles
+    .word mug_latiosPal