Karathan
/
source_of_the_sovereign
espelho de https://github.com/SBird1337/source_of_the_sovereign
Observar 1
Favorito 0
Fork 0
Código Issues Versões 0 Wiki Atividade
Ver código fonte

Script Progress: Ruine der Wächter

dragonflysots 6 anos atrás
pai
c784c3a7ca
commit
e47db6dd28
10 arquivos alterados com 49 adições e 30 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 24
    24
      data/overworld/overworld_frames.s
  2. 1
    1
      sots-private
  3. 5
    0
      src/include/constants/pymap/main_story_variables.h
  4. 5
    0
      src/include/constants/pymap/main_story_variables.s
  5. 0
    1
      src/include/constants/pymap/rival_pokemon_variables.h
  6. 0
    1
      src/include/constants/pymap/rival_pokemon_variables.s
  7. 7
    0
      src/include/constants/pymap/story_flags.h
  8. 7
    0
      src/include/constants/pymap/story_flags.s
  9. 0
    1
      src/include/pymap_constants.h
  10. 0
    2
      src/include/script/language.h

+ 24
- 24
data/overworld/overworld_frames.s Ver arquivo 

@@ -7016,22 +7016,22 @@ ow_frames_npcs_0197:
7016 7016 
 .word ow_npcs_0197Tiles+(2*0x200)
7017 7017 
 .hword 0x200
7018 7018 
 .hword 0x0
7019 
-.word ow_npcs_0197Tiles+(1*0x200)
7019 
+.word ow_npcs_0197Tiles+(0*0x200)
7020 7020 
 .hword 0x200
7021 7021 
 .hword 0x0
7022 
-.word ow_npcs_0197Tiles+(1*0x200)
7022 
+.word ow_npcs_0197Tiles+(0*0x200)
7023 7023 
 .hword 0x200
7024 7024 
 .hword 0x0
7025 
-.word ow_npcs_0197Tiles+(2*0x200)
7025 
+.word ow_npcs_0197Tiles+(0*0x200)
7026 7026 
 .hword 0x200
7027 7027 
 .hword 0x0
7028 
-.word ow_npcs_0197Tiles+(2*0x200)
7028 
+.word ow_npcs_0197Tiles+(0*0x200)
7029 7029 
 .hword 0x200
7030 7030 
 .hword 0x0
7031 
-.word ow_npcs_0197Tiles+(3*0x200)
7031 
+.word ow_npcs_0197Tiles+(0*0x200)
7032 7032 
 .hword 0x200
7033 7033 
 .hword 0x0
7034 
-.word ow_npcs_0197Tiles+(3*0x200)
7034 
+.word ow_npcs_0197Tiles+(0*0x200)
7035 7035 
 .hword 0x200
7036 7036 
 .hword 0x0
7037 7037 
 
@@ -7046,22 +7046,22 @@ ow_frames_npcs_0198:
7046 7046 
 .word ow_npcs_0198Tiles+(2*0x200)
7047 7047 
 .hword 0x200
7048 7048 
 .hword 0x0
7049 
-.word ow_npcs_0198Tiles+(1*0x200)
7049 
+.word ow_npcs_0198Tiles+(0*0x200)
7050 7050 
 .hword 0x200
7051 7051 
 .hword 0x0
7052 
-.word ow_npcs_0198Tiles+(1*0x200)
7052 
+.word ow_npcs_0198Tiles+(0*0x200)
7053 7053 
 .hword 0x200
7054 7054 
 .hword 0x0
7055 
-.word ow_npcs_0198Tiles+(2*0x200)
7055 
+.word ow_npcs_0198Tiles+(0*0x200)
7056 7056 
 .hword 0x200
7057 7057 
 .hword 0x0
7058 
-.word ow_npcs_0198Tiles+(2*0x200)
7058 
+.word ow_npcs_0198Tiles+(0*0x200)
7059 7059 
 .hword 0x200
7060 7060 
 .hword 0x0
7061 
-.word ow_npcs_0198Tiles+(3*0x200)
7061 
+.word ow_npcs_0198Tiles+(0*0x200)
7062 7062 
 .hword 0x200
7063 7063 
 .hword 0x0
7064 
-.word ow_npcs_0198Tiles+(3*0x200)
7064 
+.word ow_npcs_0198Tiles+(0*0x200)
7065 7065 
 .hword 0x200
7066 7066 
 .hword 0x0
7067 7067 
 
@@ -7076,22 +7076,22 @@ ow_frames_npcs_0199:
7076 7076 
 .word ow_npcs_0199Tiles+(2*0x200)
7077 7077 
 .hword 0x200
7078 7078 
 .hword 0x0
7079 
-.word ow_npcs_0199Tiles+(1*0x200)
7079 
+.word ow_npcs_0199Tiles+(0*0x200)
7080 7080 
 .hword 0x200
7081 7081 
 .hword 0x0
7082 
-.word ow_npcs_0199Tiles+(1*0x200)
7082 
+.word ow_npcs_0199Tiles+(0*0x200)
7083 7083 
 .hword 0x200
7084 7084 
 .hword 0x0
7085 
-.word ow_npcs_0199Tiles+(2*0x200)
7085 
+.word ow_npcs_0199Tiles+(0*0x200)
7086 7086 
 .hword 0x200
7087 7087 
 .hword 0x0
7088 
-.word ow_npcs_0199Tiles+(2*0x200)
7088 
+.word ow_npcs_0199Tiles+(0*0x200)
7089 7089 
 .hword 0x200
7090 7090 
 .hword 0x0
7091 
-.word ow_npcs_0199Tiles+(3*0x200)
7091 
+.word ow_npcs_0199Tiles+(0*0x200)
7092 7092 
 .hword 0x200
7093 7093 
 .hword 0x0
7094 
-.word ow_npcs_0199Tiles+(3*0x200)
7094 
+.word ow_npcs_0199Tiles+(0*0x200)
7095 7095 
 .hword 0x200
7096 7096 
 .hword 0x0
7097 7097 
 
@@ -7106,22 +7106,22 @@ ow_frames_npcs_0200:
7106 7106 
 .word ow_npcs_0200Tiles+(2*0x200)
7107 7107 
 .hword 0x200
7108 7108 
 .hword 0x0
7109 
-.word ow_npcs_0200Tiles+(1*0x200)
7109 
+.word ow_npcs_0200Tiles+(0*0x200)
7110 7110 
 .hword 0x200
7111 7111 
 .hword 0x0
7112 
-.word ow_npcs_0200Tiles+(1*0x200)
7112 
+.word ow_npcs_0200Tiles+(0*0x200)
7113 7113 
 .hword 0x200
7114 7114 
 .hword 0x0
7115 
-.word ow_npcs_0200Tiles+(2*0x200)
7115 
+.word ow_npcs_0200Tiles+(0*0x200)
7116 7116 
 .hword 0x200
7117 7117 
 .hword 0x0
7118 
-.word ow_npcs_0200Tiles+(2*0x200)
7118 
+.word ow_npcs_0200Tiles+(0*0x200)
7119 7119 
 .hword 0x200
7120 7120 
 .hword 0x0
7121 
-.word ow_npcs_0200Tiles+(3*0x200)
7121 
+.word ow_npcs_0200Tiles+(0*0x200)
7122 7122 
 .hword 0x200
7123 7123 
 .hword 0x0
7124 
-.word ow_npcs_0200Tiles+(3*0x200)
7124 
+.word ow_npcs_0200Tiles+(0*0x200)
7125 7125 
 .hword 0x200
7126 7126 
 .hword 0x0
7127 7127

+ 1
- 1
sots-private 

@@ -1 +1 @@
1 
-Subproject commit 2cf0b1fcd8f3e6a8c9e14c116dfd3a8e2836dda0
1 
+Subproject commit 8057be3ad7779b535b009cd8b1588068a7a23270

+ 5
- 0
src/include/constants/pymap/main_story_variables.h Ver arquivo 

@@ -27,3 +27,8 @@
27 27 
 #define VALUE_RDW_INNERES_STEINTAFELN2 0x19
28 28 
 #define VALUE_HEILIGTUM_RDW_MAPSCRIPT 0x1a
29 29 
 #define VALUE_HEILIGTUM_RDW_BESIEGT 0x1b
30 
+#define VALUE_PERSON_ANGESPROCHEN1 0x1c
31 
+#define VALUE_PERSON_ANGESPROCHEN2 0x1d
32 
+#define VALUE_PERSON_ANGESPROCHEN3 0x1e
33 
+#define VALUE_ZEHEILIGTUM_INNERES_MAPSCRIPT2 0x1f
34 
+#define VALUE_RDW_HEILIGE_STEINE_MAPSCRIPT 0x20

+ 5
- 0
src/include/constants/pymap/main_story_variables.s Ver arquivo 

@@ -27,3 +27,8 @@
27 27 
 .equ VALUE_RDW_INNERES_STEINTAFELN2, 0x19
28 28 
 .equ VALUE_HEILIGTUM_RDW_MAPSCRIPT, 0x1a
29 29 
 .equ VALUE_HEILIGTUM_RDW_BESIEGT, 0x1b
30 
+.equ VALUE_PERSON_ANGESPROCHEN1, 0x1c
31 
+.equ VALUE_PERSON_ANGESPROCHEN2, 0x1d
32 
+.equ VALUE_PERSON_ANGESPROCHEN3, 0x1e
33 
+.equ VALUE_ZEHEILIGTUM_INNERES_MAPSCRIPT2, 0x1f
34 
+.equ VALUE_RDW_HEILIGE_STEINE_MAPSCRIPT, 0x20

+ 0
- 1
src/include/constants/pymap/rival_pokemon_variables.h Ver arquivo 

@@ -1 +0,0 @@
1 
-#define VAR_STARTER_RIVALE_POKEMON 0x5053

+ 0
- 1
src/include/constants/pymap/rival_pokemon_variables.s Ver arquivo 

@@ -1 +0,0 @@
1 
-.equ VAR_STARTER_RIVALE_POKEMON, 0x5053

+ 7
- 0
src/include/constants/pymap/story_flags.h Ver arquivo 

@@ -31,3 +31,10 @@
31 31 
 #define FLAG_REBOST_LATIAS_RAETSEL_KERZE2 0x51e
32 32 
 #define FLAG_REBOST_LATIAS_RAETSEL_KERZE3 0x51f
33 33 
 #define FLAG_REBOST_LATIAS_RAETSEL_KERZE4 0x520
34 
+#define FLAG_RDW_INNERES_GEFAESSE 0x521
35 
+#define FLAG_RDW_HIDE_OHNMAECHTIG_NOAH 0x522
36 
+#define FLAG_RDW_HIDE_OHNMAECHTIG_EMMA 0x523
37 
+#define FLAG_RDW_HIDE_OHNMAECHTIG_ACHIM 0x524
38 
+#define FLAG_RDW_HIDE_OHNMAECHTIG_IDAN 0x525
39 
+#define FLAG_RDW_HIDE_ACHIM_IDAN_RIVAL 0x526
40 
+#define FLAG_RDW_HIDE_FIRNONTOR_FROSDEDJE 0x527

+ 7
- 0
src/include/constants/pymap/story_flags.s Ver arquivo 

@@ -31,3 +31,10 @@
31 31 
 .equ FLAG_REBOST_LATIAS_RAETSEL_KERZE2, 0x51e
32 32 
 .equ FLAG_REBOST_LATIAS_RAETSEL_KERZE3, 0x51f
33 33 
 .equ FLAG_REBOST_LATIAS_RAETSEL_KERZE4, 0x520
34 
+.equ FLAG_RDW_INNERES_GEFAESSE, 0x521
35 
+.equ FLAG_RDW_HIDE_OHNMAECHTIG_NOAH, 0x522
36 
+.equ FLAG_RDW_HIDE_OHNMAECHTIG_EMMA, 0x523
37 
+.equ FLAG_RDW_HIDE_OHNMAECHTIG_ACHIM, 0x524
38 
+.equ FLAG_RDW_HIDE_OHNMAECHTIG_IDAN, 0x525
39 
+.equ FLAG_RDW_HIDE_ACHIM_IDAN_RIVAL, 0x526
40 
+.equ FLAG_RDW_HIDE_FIRNONTOR_FROSDEDJE, 0x527

+ 0
- 1
src/include/pymap_constants.h Ver arquivo 

@@ -30,7 +30,6 @@
30 30 
 #include <constants/pymap/npc_sprite_table4.h>
31 31 
 #include <constants/pymap/person_behaviours.h>
32 32 
 #include <constants/pymap/riddle_variables.h>
33 
-#include <constants/pymap/rival_pokemon_variables.h>
34 33 
 #include <constants/pymap/save_variables.h>
35 34 
 #include <constants/pymap/sidequest_flags.h>
36 35 
 #include <constants/pymap/signpost_types.h>

+ 0
- 2
src/include/script/language.h Ver arquivo 

@@ -403,9 +403,7 @@ addvar OW_REPLACE_VAR 0x1
403 403 
 setvar OW_REPLACE_TO_VAR \changeowto_to
404 404 
 .endm
405 405
406 
-
407 406 
 @@ Index commands
408 
-
409 407 
 .macro nop
410 408 
 .byte 0x0
411 409 
 .endm