Explorar el Código

Neue Pokémon Sprites, Icons, Maptilesets sortiert (baut aber nicht, wegen undefinierten Symbolen?

DragonflySotS hace 7 años
padre
commit
883d9a7511
Se han modificado 2 ficheros con 1 adiciones y 592 borrados
  1. 0
    591
      data/trainer/trainer_pkmn_data.s
  2. 1
    1
      sots-private

+ 0
- 591
data/trainer/trainer_pkmn_data.s Ver fichero

@@ -685,594 +685,3 @@ pokemon_von_id_93:
685 685
 .hword 60, 11, 238, 0
686 686
 .hword 60, 11, 751, 0
687 687
 .hword 0xFFFF
688
-
689
-
690
-.align 2
691
-pokemon_von_id_1:
692
-.hword 0, 4, 895, 0
693
-.hword 0xFFFF
694
-
695
-.align 2
696
-pokemon_von_id_2:
697
-.hword 20, 5, 895, 0
698
-.hword 0xFFFF
699
-
700
-.align 2
701
-pokemon_von_id_3:
702
-.hword 50, 5, 895, 139
703
-.hword 0xFFFF
704
-
705
-.align 2
706
-pokemon_von_id_4:
707
-.hword 0, 4, 892, 0
708
-.hword 0xFFFF
709
-
710
-.align 2
711
-pokemon_von_id_5:
712
-.hword 20, 5, 892, 0
713
-.hword 0xFFFF
714
-
715
-.align 2
716
-pokemon_von_id_6:
717
-.hword 50, 5, 892, 139
718
-.hword 0xFFFF
719
-
720
-.align 2
721
-pokemon_von_id_7:
722
-.hword 0, 4, 895, 0
723
-.hword 0xFFFF
724
-
725
-.align 2
726
-pokemon_von_id_8:
727
-.hword 20, 5, 895, 0
728
-.hword 0xFFFF
729
-
730
-.align 2
731
-pokemon_von_id_9:
732
-.hword 50, 5, 895, 139
733
-.hword 0xFFFF
734
-
735
-.align 2
736
-pokemon_von_id_10:
737
-.hword 0, 4, 892, 0
738
-.hword 0xFFFF
739
-
740
-.align 2
741
-pokemon_von_id_11:
742
-.hword 20, 5, 892, 0
743
-.hword 0xFFFF
744
-
745
-.align 2
746
-pokemon_von_id_12:
747
-.hword 50, 5, 892, 139
748
-.hword 0xFFFF
749
-
750
-.align 2
751
-pokemon_von_id_13:
752
-.hword 0, 3, 789, 0
753
-.hword 0xFFFF
754
-
755
-.align 2
756
-pokemon_von_id_14:
757
-.hword 20, 3, 789, 0
758
-.hword 20, 4, 787, 0
759
-.hword 0xFFFF
760
-
761
-.align 2
762
-pokemon_von_id_15:
763
-.hword 50, 3, 789, 0
764
-.hword 50, 4, 787, 0
765
-.hword 0xFFFF
766
-
767
-.align 2
768
-pokemon_von_id_16:
769
-.hword 0, 4, 13, 0
770
-.hword 0, 5, 10, 0
771
-.hword 0xFFFF
772
-
773
-.align 2
774
-pokemon_von_id_17:
775
-.hword 20, 4, 13, 0
776
-.hword 20, 5, 10, 0
777
-.hword 20, 5, 290, 0
778
-.hword 0xFFFF
779
-
780
-.align 2
781
-pokemon_von_id_18:
782
-.hword 50, 4, 13, 0
783
-.hword 50, 5, 10, 0
784
-.hword 50, 5, 290, 0
785
-.hword 0xFFFF
786
-
787
-.align 2
788
-pokemon_von_id_19:
789
-.hword 0, 4, 46, 0
790
-.hword 0, 5, 795, 0
791
-.hword 0, 5, 291, 0
792
-.hword 0xFFFF
793
-
794
-.align 2
795
-pokemon_von_id_20:
796
-.hword 20, 4, 46, 0
797
-.hword 20, 5, 795, 0
798
-.hword 20, 5, 291, 0
799
-.hword 0xFFFF
800
-
801
-.align 2
802
-pokemon_von_id_21:
803
-.hword 50, 4, 46, 0
804
-.hword 50, 5, 795, 0
805
-.hword 50, 5, 291, 0
806
-.hword 50, 6, 293, 0
807
-.hword 0xFFFF
808
-
809
-.align 2
810
-pokemon_von_id_22:
811
-.hword 0, 5, 84, 0
812
-.hword 0, 5, 456, 0
813
-.hword 0xFFFF
814
-
815
-.align 2
816
-pokemon_von_id_23:
817
-.hword 20, 5, 84, 0
818
-.hword 20, 5, 456, 0
819
-.hword 0xFFFF
820
-
821
-.align 2
822
-pokemon_von_id_24:
823
-.hword 50, 5, 84, 0
824
-.hword 50, 5, 456, 0
825
-.hword 50, 6, 564, 0
826
-.hword 0xFFFF
827
-
828
-.align 2
829
-pokemon_von_id_25:
830
-.hword 0, 6, 566, 0
831
-.hword 0xFFFF
832
-
833
-.align 2
834
-pokemon_von_id_26:
835
-.hword 20, 6, 566, 0
836
-.hword 0xFFFF
837
-
838
-.align 2
839
-pokemon_von_id_27:
840
-.hword 50, 6, 566, 0
841
-.hword 50, 6, 568, 0
842
-.hword 0xFFFF
843
-
844
-.align 2
845
-pokemon_von_id_28:
846
-.hword 0, 5, 301, 0
847
-.hword 0, 6, 11, 0
848
-.hword 0xFFFF
849
-
850
-.align 2
851
-pokemon_von_id_29:
852
-.hword 20, 5, 301, 10, 106, 71, 0
853
-.hword 20, 6, 11, 10, 81, 106, 0
854
-.hword 0xFFFF
855
-
856
-.align 2
857
-pokemon_von_id_30:
858
-.hword 50, 5, 301, 10, 106, 71, 0
859
-.hword 50, 6, 11, 10, 81, 106, 0
860
-.hword 0xFFFF
861
-
862
-.align 2
863
-pokemon_von_id_31:
864
-.hword 0, 4, 165, 0
865
-.hword 0, 4, 14, 0
866
-.hword 0, 5, 11, 0
867
-.hword 0, 5, 293, 0
868
-.hword 0xFFFF
869
-
870
-.align 2
871
-pokemon_von_id_32:
872
-.hword 20, 4, 165, 33, 48, 0, 0
873
-.hword 20, 4, 14, 33, 81, 106, 0
874
-.hword 20, 5, 11, 33, 81, 106, 0
875
-.hword 20, 5, 293, 33, 81, 106, 0
876
-.hword 0xFFFF
877
-
878
-.align 2
879
-pokemon_von_id_33:
880
-.hword 50, 4, 165, 33, 48, 0, 0
881
-.hword 50, 4, 14, 33, 81, 106, 0
882
-.hword 50, 5, 11, 33, 81, 106, 0
883
-.hword 50, 5, 293, 33, 81, 106, 0
884
-.hword 50, 5, 291, 33, 81, 106, 0
885
-.hword 0xFFFF
886
-
887
-.align 2
888
-pokemon_von_id_34:
889
-.hword 0, 5, 109, 0
890
-.hword 0, 6, 506, 0
891
-.hword 0xFFFF
892
-
893
-.align 2
894
-pokemon_von_id_35:
895
-.hword 20, 5, 109, 0
896
-.hword 20, 6, 506, 0
897
-.hword 0xFFFF
898
-
899
-.align 2
900
-pokemon_von_id_36:
901
-.hword 50, 5, 109, 0
902
-.hword 50, 6, 506, 0
903
-.hword 0xFFFF
904
-
905
-.align 2
906
-pokemon_von_id_37:
907
-.hword 0, 5, 784, 0
908
-.hword 0, 6, 797, 0
909
-.hword 0xFFFF
910
-
911
-.align 2
912
-pokemon_von_id_38:
913
-.hword 20, 5, 784, 0
914
-.hword 20, 6, 797, 0
915
-.hword 0xFFFF
916
-
917
-.align 2
918
-pokemon_von_id_39:
919
-.hword 50, 5, 784, 0
920
-.hword 50, 6, 797, 0
921
-.hword 0xFFFF
922
-
923
-.align 2
924
-pokemon_von_id_40:
925
-.hword 0, 4, 459, 0
926
-.hword 0, 5, 306, 0
927
-.hword 0, 6, 452, 0
928
-.hword 0xFFFF
929
-
930
-.align 2
931
-pokemon_von_id_41:
932
-.hword 20, 4, 459, 0
933
-.hword 20, 5, 306, 0
934
-.hword 20, 6, 452, 0
935
-.hword 0xFFFF
936
-
937
-.align 2
938
-pokemon_von_id_42:
939
-.hword 50, 4, 459, 0
940
-.hword 50, 5, 306, 0
941
-.hword 50, 6, 452, 0
942
-.hword 0xFFFF
943
-
944
-.align 2
945
-pokemon_von_id_43:
946
-.hword 0, 7, 291, 0
947
-.hword 0xFFFF
948
-
949
-.align 2
950
-pokemon_von_id_44:
951
-.hword 20, 7, 291, 0
952
-.hword 0xFFFF
953
-
954
-.align 2
955
-pokemon_von_id_45:
956
-.hword 50, 8, 291, 0
957
-.hword 0xFFFF
958
-
959
-.align 2
960
-pokemon_von_id_46:
961
-.hword 0, 6, 167, 0
962
-.hword 0, 7, 386, 0
963
-.hword 0xFFFF
964
-
965
-.align 2
966
-pokemon_von_id_47:
967
-.hword 20, 6, 167, 0
968
-.hword 20, 7, 386, 0
969
-.hword 0xFFFF
970
-
971
-.align 2
972
-pokemon_von_id_48:
973
-.hword 50, 6, 167, 0
974
-.hword 50, 7, 386, 0
975
-.hword 0xFFFF
976
-
977
-.align 2
978
-pokemon_von_id_49:
979
-.hword 0, 6, 48, 0
980
-.hword 0, 7, 717, 0
981
-.hword 0xFFFF
982
-
983
-.align 2
984
-pokemon_von_id_50:
985
-.hword 20, 6, 48, 0
986
-.hword 20, 7, 717, 0
987
-.hword 0xFFFF
988
-
989
-.align 2
990
-pokemon_von_id_51:
991
-.hword 50, 6, 48, 0
992
-.hword 50, 7, 717, 0
993
-.hword 0xFFFF
994
-
995
-.align 2
996
-pokemon_von_id_52:
997
-.hword 0, 7, 293, 0
998
-.hword 0xFFFF
999
-
1000
-.align 2
1001
-pokemon_von_id_53:
1002
-.hword 20, 7, 293, 0
1003
-.hword 0xFFFF
1004
-
1005
-.align 2
1006
-pokemon_von_id_54:
1007
-.hword 50, 8, 293, 0
1008
-.hword 0xFFFF
1009
-
1010
-.align 2
1011
-pokemon_von_id_55:
1012
-.hword 0, 5, 79, 0
1013
-.hword 0, 6, 804, 0
1014
-.hword 0xFFFF
1015
-
1016
-.align 2
1017
-pokemon_von_id_56:
1018
-.hword 20, 5, 79, 0
1019
-.hword 20, 6, 804, 0
1020
-.hword 0xFFFF
1021
-
1022
-.align 2
1023
-pokemon_von_id_57:
1024
-.hword 50, 5, 79, 0
1025
-.hword 50, 6, 804, 0
1026
-.hword 0xFFFF
1027
-
1028
-.align 2
1029
-pokemon_von_id_58:
1030
-.hword 0, 6, 512, 0
1031
-.hword 0, 6, 765, 0
1032
-.hword 60, 7, 220, 0
1033
-.hword 0xFFFF
1034
-
1035
-.align 2
1036
-pokemon_von_id_59:
1037
-.hword 30, 7, 512, 0
1038
-.hword 30, 7, 765, 0
1039
-.hword 60, 8, 220, 0
1040
-.hword 0xFFFF
1041
-
1042
-.align 2
1043
-pokemon_von_id_60:
1044
-.hword 60, 8, 512, 0
1045
-.hword 60, 8, 765, 0
1046
-.hword 60, 9, 220, 0
1047
-.hword 60, 10, 215, 0
1048
-.hword 0xFFFF
1049
-
1050
-.align 2
1051
-pokemon_von_id_61:
1052
-.hword 0, 7, 346, 0
1053
-.hword 0, 7, 220, 0
1054
-.hword 0, 8, 934, 0
1055
-.hword 0xFFFF
1056
-
1057
-.align 2
1058
-pokemon_von_id_62:
1059
-.hword 30, 7, 346, 0
1060
-.hword 30, 7, 220, 0
1061
-.hword 30, 8, 934, 0
1062
-.hword 0xFFFF
1063
-
1064
-.align 2
1065
-pokemon_von_id_63:
1066
-.hword 60, 8, 346, 0
1067
-.hword 60, 8, 220, 0
1068
-.hword 60, 9, 934, 0
1069
-.hword 60, 9, 512, 0
1070
-.hword 0xFFFF
1071
-
1072
-.align 2
1073
-pokemon_von_id_64:
1074
-.hword 0, 7, 341, 0
1075
-.hword 0, 7, 635, 0
1076
-.hword 0, 8, 936, 0
1077
-.hword 0xFFFF
1078
-
1079
-.align 2
1080
-pokemon_von_id_65:
1081
-.hword 30, 7, 341, 0
1082
-.hword 30, 7, 635, 0
1083
-.hword 30, 8, 936, 0
1084
-.hword 0xFFFF
1085
-
1086
-.align 2
1087
-pokemon_von_id_66:
1088
-.hword 60, 8, 341, 0
1089
-.hword 60, 8, 635, 0
1090
-.hword 60, 9, 936, 0
1091
-.hword 60, 9, 215, 0
1092
-.hword 0xFFFF
1093
-
1094
-.align 2
1095
-pokemon_von_id_67:
1096
-.hword 0, 9, 934, 0
1097
-.hword 0, 10, 635, 0
1098
-.hword 0xFFFF
1099
-
1100
-.align 2
1101
-pokemon_von_id_68:
1102
-.hword 30, 9, 934, 0
1103
-.hword 30, 10, 635, 0
1104
-.hword 0xFFFF
1105
-
1106
-.align 2
1107
-pokemon_von_id_69:
1108
-.hword 60, 9, 934, 0
1109
-.hword 60, 10, 635, 0
1110
-.hword 60, 10, 512, 0
1111
-.hword 0xFFFF
1112
-
1113
-.align 2
1114
-pokemon_von_id_70:
1115
-.hword 0, 9, 936, 0
1116
-.hword 0, 10, 765, 0
1117
-.hword 0xFFFF
1118
-
1119
-.align 2
1120
-pokemon_von_id_71:
1121
-.hword 30, 9, 936, 0
1122
-.hword 30, 10, 765, 0
1123
-.hword 0xFFFF
1124
-
1125
-.align 2
1126
-pokemon_von_id_72:
1127
-.hword 60, 9, 936, 0
1128
-.hword 60, 10, 765, 0
1129
-.hword 60, 10, 215, 0
1130
-.hword 0xFFFF
1131
-
1132
-.align 2
1133
-pokemon_von_id_73:
1134
-.hword 0, 10, 346, 0
1135
-.hword 0, 10, 341, 0
1136
-.hword 0xFFFF
1137
-
1138
-.align 2
1139
-pokemon_von_id_74:
1140
-.hword 30, 10, 346, 0
1141
-.hword 30, 10, 341, 0
1142
-.hword 0xFFFF
1143
-
1144
-.align 2
1145
-pokemon_von_id_75:
1146
-.hword 60, 10, 346, 0
1147
-.hword 60, 10, 341, 0
1148
-.hword 60, 11, 934, 0
1149
-.hword 0xFFFF
1150
-
1151
-.align 2
1152
-pokemon_von_id_76:
1153
-.hword 0, 10, 86, 0
1154
-.hword 0, 11, 666, 0
1155
-.hword 0xFFFF
1156
-
1157
-.align 2
1158
-pokemon_von_id_77:
1159
-.hword 30, 10, 86, 0
1160
-.hword 30, 11, 666, 0
1161
-.hword 0xFFFF
1162
-
1163
-.align 2
1164
-pokemon_von_id_78:
1165
-.hword 60, 10, 86, 0
1166
-.hword 60, 11, 666, 0
1167
-.hword 60, 11, 936, 0
1168
-.hword 0xFFFF
1169
-
1170
-.align 2
1171
-pokemon_von_id_79:
1172
-.hword 0, 9, 220, 0
1173
-.hword 0, 10, 792, 0
1174
-.hword 0, 10, 512, 0
1175
-.hword 0xFFFF
1176
-
1177
-.align 2
1178
-pokemon_von_id_80:
1179
-.hword 30, 9, 220, 0
1180
-.hword 30, 10, 792, 0
1181
-.hword 30, 10, 512, 0
1182
-.hword 0xFFFF
1183
-
1184
-.align 2
1185
-pokemon_von_id_81:
1186
-.hword 60, 9, 220, 0
1187
-.hword 60, 10, 792, 0
1188
-.hword 60, 10, 512, 0
1189
-.hword 60, 11, 635, 0
1190
-.hword 0xFFFF
1191
-
1192
-.align 2
1193
-pokemon_von_id_82:
1194
-.hword 0, 9, 238, 0
1195
-.hword 0, 10, 936, 0
1196
-.hword 0, 10, 346, 0
1197
-.hword 0xFFFF
1198
-
1199
-.align 2
1200
-pokemon_von_id_83:
1201
-.hword 30, 9, 238, 0
1202
-.hword 30, 10, 936, 0
1203
-.hword 30, 10, 346, 0
1204
-.hword 0xFFFF
1205
-
1206
-.align 2
1207
-pokemon_von_id_84:
1208
-.hword 60, 9, 238, 0
1209
-.hword 60, 10, 936, 0
1210
-.hword 60, 10, 346, 0
1211
-.hword 60, 11, 666, 0
1212
-.hword 0xFFFF
1213
-
1214
-.align 2
1215
-pokemon_von_id_85:
1216
-.hword 30, 10, 225, 0
1217
-.hword 30, 11, 220, 0
1218
-.hword 30, 12, 934, 0
1219
-.hword 30, 12, 936, 0
1220
-.hword 30, 14, 385, 0
1221
-.hword 0xFFFF
1222
-
1223
-.align 2
1224
-pokemon_von_id_86:
1225
-.hword 60, 10, 225, 0
1226
-.hword 60, 11, 220, 0
1227
-.hword 60, 12, 934, 0
1228
-.hword 60, 12, 936, 0
1229
-.hword 60, 14, 385, 0
1230
-.hword 0xFFFF
1231
-
1232
-.align 2
1233
-pokemon_von_id_87:
1234
-.hword 100, 11, 225, 258, 217, 420, 252
1235
-.hword 100, 12, 220, 258, 189, 246, 333
1236
-.hword 100, 13, 934, 258, 301, 174, 232
1237
-.hword 100, 13, 936, 258, 204, 50, 109
1238
-.hword 100, 14, 385, 258, 181, 52, 55
1239
-.hword 100, 15, 91, 258, 182, 41, 350
1240
-.hword 0xFFFF
1241
-
1242
-.align 2
1243
-pokemon_von_id_88:
1244
-.hword 0, 10, 635, 0
1245
-.hword 0, 11, 341, 0
1246
-.hword 0xFFFF
1247
-
1248
-.align 2
1249
-pokemon_von_id_89:
1250
-.hword 30, 10, 635, 0
1251
-.hword 30, 11, 341, 0
1252
-.hword 0xFFFF
1253
-
1254
-.align 2
1255
-pokemon_von_id_90:
1256
-.hword 60, 10, 635, 0
1257
-.hword 60, 11, 341, 0
1258
-.hword 60, 11, 751, 0
1259
-.hword 0xFFFF
1260
-
1261
-.align 2
1262
-pokemon_von_id_91:
1263
-.hword 0, 10, 220, 0
1264
-.hword 0, 11, 238, 0
1265
-.hword 0xFFFF
1266
-
1267
-.align 2
1268
-pokemon_von_id_92:
1269
-.hword 30, 10, 220, 0
1270
-.hword 30, 11, 238, 0
1271
-.hword 0xFFFF
1272
-
1273
-.align 2
1274
-pokemon_von_id_93:
1275
-.hword 60, 10, 220, 0
1276
-.hword 60, 11, 238, 0
1277
-.hword 60, 11, 751, 0
1278
-.hword 0xFFFF

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 158d1fb72312d2f213e0452ea9acc3e6aa8e28bc
1
+Subproject commit cfb2c726907e29413791d7010bf69c2d7a522356