Karathan
/
source_of_the_sovereign
mirror of https://github.com/SBird1337/source_of_the_sovereign
Watch 1
Star 0
Fork 0
Code Issues Releases 0 Wiki Activity
Browse Source

Script Progress: Ruine der Wächter

dragonflysots 7 years ago
parent
c784c3a7ca
commit
e47db6dd28
10 changed files with 49 additions and 30 deletions
Unified View Show Diff Stats
  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 View File

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

+ 1
- 1
sots-private

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

+ 5
- 0
src/include/constants/pymap/main_story_variables.h View File

27 
 #define VALUE_RDW_INNERES_STEINTAFELN2 0x19
 27 
 #define VALUE_RDW_INNERES_STEINTAFELN2 0x19
28 
 #define VALUE_HEILIGTUM_RDW_MAPSCRIPT 0x1a
 28 
 #define VALUE_HEILIGTUM_RDW_MAPSCRIPT 0x1a
29 
 #define VALUE_HEILIGTUM_RDW_BESIEGT 0x1b
 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 View File

27 
 .equ VALUE_RDW_INNERES_STEINTAFELN2, 0x19
 27 
 .equ VALUE_RDW_INNERES_STEINTAFELN2, 0x19
28 
 .equ VALUE_HEILIGTUM_RDW_MAPSCRIPT, 0x1a
 28 
 .equ VALUE_HEILIGTUM_RDW_MAPSCRIPT, 0x1a
29 
 .equ VALUE_HEILIGTUM_RDW_BESIEGT, 0x1b
 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 View File

1 
-#define VAR_STARTER_RIVALE_POKEMON 0x5053

+ 0
- 1
src/include/constants/pymap/rival_pokemon_variables.s View File

1 
-.equ VAR_STARTER_RIVALE_POKEMON, 0x5053

+ 7
- 0
src/include/constants/pymap/story_flags.h View File

31 
 #define FLAG_REBOST_LATIAS_RAETSEL_KERZE2 0x51e
 31 
 #define FLAG_REBOST_LATIAS_RAETSEL_KERZE2 0x51e
32 
 #define FLAG_REBOST_LATIAS_RAETSEL_KERZE3 0x51f
 32 
 #define FLAG_REBOST_LATIAS_RAETSEL_KERZE3 0x51f
33 
 #define FLAG_REBOST_LATIAS_RAETSEL_KERZE4 0x520
 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 View File

31 
 .equ FLAG_REBOST_LATIAS_RAETSEL_KERZE2, 0x51e
 31 
 .equ FLAG_REBOST_LATIAS_RAETSEL_KERZE2, 0x51e
32 
 .equ FLAG_REBOST_LATIAS_RAETSEL_KERZE3, 0x51f
 32 
 .equ FLAG_REBOST_LATIAS_RAETSEL_KERZE3, 0x51f
33 
 .equ FLAG_REBOST_LATIAS_RAETSEL_KERZE4, 0x520
 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 View File

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

+ 0
- 2
src/include/script/language.h View File

403 
 setvar OW_REPLACE_TO_VAR \changeowto_to
 403 
 setvar OW_REPLACE_TO_VAR \changeowto_to
404 
 .endm
 404 
 .endm
405
405
406 
-
407 
 @@ Index commands
 406 
 @@ Index commands
408 
-
409 
 .macro nop
 407 
 .macro nop
410 
 .byte 0x0
 408 
 .byte 0x0
411 
 .endm
 409 
 .endm