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

merge commit 30d9b02 into master

SBird1337 8 years ago
parent
927b47b1fa 30d9b022a3
commit
c259a27ce4
7 changed files with 5953 additions and 5959 deletions
Split View Show Diff Stats
  1. 2389
    2389
      data/overworld/overworld_data.S
  2. 2389
    2389
      data/overworld/overworld_data.s
  3. 582
    585
      data/overworld/overworld_frames.S
  4. 582
    585
      data/overworld/overworld_frames.s
  5. 5
    5
      data/overworld/overworld_pal_table.S
  6. 5
    5
      data/overworld/overworld_pal_table.s
  7. 1
    1
      sots-private

+ 2389
- 2389
data/overworld/overworld_data.S
File diff suppressed because it is too large
View File


+ 2389
- 2389
data/overworld/overworld_data.s
File diff suppressed because it is too large
View File


+ 582
- 585
data/overworld/overworld_frames.S
File diff suppressed because it is too large
View File


+ 582
- 585
data/overworld/overworld_frames.s
File diff suppressed because it is too large
View File


+ 5
- 5
data/overworld/overworld_pal_table.S View File 

@@ -3,7 +3,7 @@
3 3 
 .align 2
4 4
5 5 
 .global ow_pal_table
6 
-ow_pal_table:
6 
+ow_pal_table:
7 7 
 .word ow_0000Pal
8 8 
 .byte 0, 17, 0, 0
9 9 
 .word ow_0001Pal

@@ -1028,7 +1028,7 @@ ow_pal_table:
1028 1028 
 .byte 254, 18, 0, 0
1029 1029 
 .word ow_00000Pal
1030 1030 
 .byte 255, 18, 0, 0
1031 
-.word ow_00000Pal
1031 
+.word ow_0512Pal
1032 1032 
 .byte 0, 19, 0, 0
1033 1033 
 .word ow_0513Pal
1034 1034 
 .byte 1, 19, 0, 0

@@ -1068,9 +1068,9 @@ ow_pal_table:
1068 1068 
 .byte 18, 19, 0, 0
1069 1069 
 .word ow_0531Pal
1070 1070 
 .byte 19, 19, 0, 0
1071 
-.word ow_00000Pal
1071 
+.word ow_0532Pal
1072 1072 
 .byte 20, 19, 0, 0
1073 
-.word ow_00000Pal
1073 
+.word ow_0533Pal
1074 1074 
 .byte 21, 19, 0, 0
1075 1075 
 .word ow_00000Pal
1076 1076 
 .byte 22, 19, 0, 0

@@ -1543,4 +1543,4 @@ ow_pal_table:
1543 1543
1544 1544 
 .global npc_palettes
1545 1545 
 npc_palettes:
1546 
-    .word ow_pal_table
1546 
+.word ow_pal_table

+ 5
- 5
data/overworld/overworld_pal_table.s View File 

@@ -3,7 +3,7 @@
3 3 
 .align 2
4 4
5 5 
 .global ow_pal_table
6 
-ow_pal_table:
6 
+ow_pal_table:
7 7 
 .word ow_0000Pal
8 8 
 .byte 0, 17, 0, 0
9 9 
 .word ow_0001Pal

@@ -1028,7 +1028,7 @@ ow_pal_table:
1028 1028 
 .byte 254, 18, 0, 0
1029 1029 
 .word ow_00000Pal
1030 1030 
 .byte 255, 18, 0, 0
1031 
-.word ow_00000Pal
1031 
+.word ow_0512Pal
1032 1032 
 .byte 0, 19, 0, 0
1033 1033 
 .word ow_0513Pal
1034 1034 
 .byte 1, 19, 0, 0

@@ -1068,9 +1068,9 @@ ow_pal_table:
1068 1068 
 .byte 18, 19, 0, 0
1069 1069 
 .word ow_0531Pal
1070 1070 
 .byte 19, 19, 0, 0
1071 
-.word ow_00000Pal
1071 
+.word ow_0532Pal
1072 1072 
 .byte 20, 19, 0, 0
1073 
-.word ow_00000Pal
1073 
+.word ow_0533Pal
1074 1074 
 .byte 21, 19, 0, 0
1075 1075 
 .word ow_00000Pal
1076 1076 
 .byte 22, 19, 0, 0

@@ -1543,4 +1543,4 @@ ow_pal_table:
1543 1543
1544 1544 
 .global npc_palettes
1545 1545 
 npc_palettes:
1546 
-    .word ow_pal_table
1546 
+.word ow_pal_table

+ 1
- 1
sots-private 

@@ -1 +1 @@
1 
-Subproject commit 3e1a76a19bf200d3abd5f265c9adf8ccf7dde8a8
1 
+Subproject commit 46812f578eb73c9a8a2397680c112877637e337a