瀏覽代碼

sots-private: Neue Scripts und so

DragonflySotS 7 年之前
父節點
當前提交
766cccde96
共有 5 個文件被更改,包括 22 次插入16 次删除
  1. 1
    1
      battle_engine
  2. 8
    8
      data/overworld/overworld_frames.s
  3. 1
    1
      sots-private
  4. 6
    0
      src/include/script_language.h
  5. 6
    6
      string/de/trainers/trainer_data.txt

+ 1
- 1
battle_engine

@@ -1 +1 @@
1
-Subproject commit 4a4fb7ac2ac3def1d4270796bdd2c04e8231d382
1
+Subproject commit a201b518834f0208efdb82ac95b08675f5279950

+ 8
- 8
data/overworld/overworld_frames.s 查看文件

@@ -6107,28 +6107,28 @@ ow_frames_npcs_0167:
6107 6107
 .word ow_npcs_0167Tiles+(0*0x200)
6108 6108
 .hword 0x200
6109 6109
 .hword 0x0
6110
-.word 0
6110
+.word ow_npcs_0167Tiles+(1*0x200)
6111 6111
 .hword 0x200
6112 6112
 .hword 0x0
6113
-.word 0
6113
+.word ow_npcs_0167Tiles+(2*0x200)
6114 6114
 .hword 0x200
6115 6115
 .hword 0x0
6116
-.word 0
6116
+.word ow_npcs_0167Tiles+(3*0x200)
6117 6117
 .hword 0x200
6118 6118
 .hword 0x0
6119
-.word 0
6119
+.word ow_npcs_0167Tiles+(4*0x200)
6120 6120
 .hword 0x200
6121 6121
 .hword 0x0
6122
-.word 0
6122
+.word ow_npcs_0167Tiles+(5*0x200)
6123 6123
 .hword 0x200
6124 6124
 .hword 0x0
6125
-.word 0
6125
+.word ow_npcs_0167Tiles+(6*0x200)
6126 6126
 .hword 0x200
6127 6127
 .hword 0x0
6128
-.word 0
6128
+.word ow_npcs_0167Tiles+(7*0x200)
6129 6129
 .hword 0x200
6130 6130
 .hword 0x0
6131
-.word 0
6131
+.word ow_npcs_0167Tiles+(8*0x200)
6132 6132
 .hword 0x200
6133 6133
 .hword 0x0
6134 6134
 .word ow_npcs_0167Tiles+(9*0x200)

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit daff2cf8d4475e10ea6854dda409d29318fda1f3
1
+Subproject commit cc641bb4476904b1f87e6934369a51f341f44fea

+ 6
- 0
src/include/script_language.h 查看文件

@@ -177,6 +177,12 @@ special 0x3B
177 177
 playsong \costumtrainerbattlemusic_id 0x0
178 178
 .endm
179 179
 
180
+.macro colorflicker colorflicker_farbbyte:req
181
+setvar 0x8000 \colorflicker_farbbyte
182
+setvar 0x5006 0x8
183
+special 0x68
184
+.endm
185
+
180 186
 .macro mugmsg mugmsg_textpointer:req mugmsg_callstd:req mugmsg_sprite:req mugmsg_facing:req
181 187
 .if \mugmsg_facing==MUGFACE_LEFT
182 188
     setvar MUGHSOT_1_TABLE \mugmsg_sprite | 0x8000

+ 6
- 6
string/de/trainers/trainer_data.txt 查看文件

@@ -707,7 +707,7 @@ str_trainer_name_88=Rüpel
707 707
 @hword 0, 0, 0, 0
708 708
 @byte 0, 0, 0, 0 
709 709
 @hword 0, 0
710
-@byte 3, 0, 0, 0 
710
+@byte 2, 0, 0, 0 
711 711
 @word pokemon_von_id_88
712 712
 
713 713
 @byte 0, 111, 111, 131 
@@ -715,7 +715,7 @@ str_trainer_name_89=Rüpel
715 715
 @hword 0, 0, 0, 0
716 716
 @byte 0, 0, 0, 0 
717 717
 @hword 15, 0
718
-@byte 3, 0, 0, 0 
718
+@byte 2, 0, 0, 0 
719 719
 @word pokemon_von_id_89
720 720
 
721 721
 @byte 0, 111, 111, 131 
@@ -723,7 +723,7 @@ str_trainer_name_90=Rüpel
723 723
 @hword 0, 0, 0, 0
724 724
 @byte 0, 0, 0, 0 
725 725
 @hword 383, 0
726
-@byte 4, 0, 0, 0 
726
+@byte 3, 0, 0, 0 
727 727
 @word pokemon_von_id_90
728 728
 
729 729
 @byte 0, 111, 239, 132 
@@ -731,7 +731,7 @@ str_trainer_name_91=Rüpel
731 731
 @hword 0, 0, 0, 0
732 732
 @byte 0, 0, 0, 0 
733 733
 @hword 0, 0
734
-@byte 3, 0, 0, 0 
734
+@byte 2, 0, 0, 0 
735 735
 @word pokemon_von_id_91
736 736
 
737 737
 @byte 0, 111, 239, 132 
@@ -739,7 +739,7 @@ str_trainer_name_92=Rüpel
739 739
 @hword 0, 0, 0, 0
740 740
 @byte 0, 0, 0, 0 
741 741
 @hword 15, 0
742
-@byte 3, 0, 0, 0 
742
+@byte 2, 0, 0, 0 
743 743
 @word pokemon_von_id_92
744 744
 
745 745
 @byte 0, 111, 239, 132 
@@ -747,5 +747,5 @@ str_trainer_name_93=Rüpel
747 747
 @hword 0, 0, 0, 0
748 748
 @byte 0, 0, 0, 0 
749 749
 @hword 383, 0
750
-@byte 4, 0, 0, 0 
750
+@byte 3, 0, 0, 0 
751 751
 @word pokemon_von_id_93