Browse Source

Some updates: Wilde Pokémon & Overworlds

dragonflysots 6 years ago
parent
commit
4938d28623
4 changed files with 432 additions and 707 deletions
  1. 6
    6
      data/overworld/overworld_data.s
  2. 26
    8
      data/overworld/overworld_frames.s
  3. 399
    692
      data/overworld/wild_pokemon_data.s
  4. 1
    1
      sots-private

+ 6
- 6
data/overworld/overworld_data.s View File

4978
 
4978
 
4979
 .align 2
4979
 .align 2
4980
 ow_data_objekt_0022:
4980
 ow_data_objekt_0022:
4981
-.hword 0xFFFF, 0xC316, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
4982
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0022, 0x8231CFC
4981
+.hword 0xFFFF, 0xC316, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0 
4982
+.word 0x83A3720, 0x83A38D0, 0x83A3660, ow_frames_objekt_0022, 0x8231CFC
4983
 
4983
 
4984
 .align 2
4984
 .align 2
4985
 ow_data_objekt_0023:
4985
 ow_data_objekt_0023:
4986
-.hword 0xFFFF, 0xC317, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
4987
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0023, 0x8231CFC
4986
+.hword 0xFFFF, 0xC317, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0 
4987
+.word 0x83A3720, 0x83A38D0, 0x83A3660, ow_frames_objekt_0023, 0x8231CFC
4988
 
4988
 
4989
 .align 2
4989
 .align 2
4990
 ow_data_objekt_0024:
4990
 ow_data_objekt_0024:
4991
-.hword 0xFFFF, 0xC318, 0x1102, 0x80, 0x10, 0x10, 0x0, 0x0
4992
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_objekt_0024, 0x8231CFC
4991
+.hword 0xFFFF, 0xC318, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
4992
+.word 0x83A3720, 0x83A38D0, 0x83A3314, ow_frames_objekt_0024 , 0x8231CFC
4993
 
4993
 
4994
 .align 2
4994
 .align 2
4995
 ow_data_objekt_0025:
4995
 ow_data_objekt_0025:

+ 26
- 8
data/overworld/overworld_frames.s View File

16485
 .hword 0x800
16485
 .hword 0x800
16486
 .hword 0x0
16486
 .hword 0x0
16487
 
16487
 
16488
-.align 2
16488
+.align 2 
16489
 ow_frames_objekt_0022:
16489
 ow_frames_objekt_0022:
16490
-.word ow_00000Tiles+(0*0x80)
16491
-.hword 0x80
16490
+.word ow_objekt_0022Tiles+(0*0x800)
16491
+.hword 0x800
16492
+.hword 0x0
16493
+.word ow_objekt_0022Tiles+(1*0x800)
16494
+.hword 0x800
16495
+.hword 0x0
16496
+.word ow_objekt_0022Tiles+(2*0x800)
16497
+.hword 0x800
16498
+.hword 0x0
16499
+.word ow_objekt_0022Tiles+(3*0x800)
16500
+.hword 0x800
16492
 .hword 0x0
16501
 .hword 0x0
16493
 
16502
 
16494
-.align 2
16503
+.align 2 
16495
 ow_frames_objekt_0023:
16504
 ow_frames_objekt_0023:
16496
-.word ow_00000Tiles+(0*0x80)
16497
-.hword 0x80
16505
+.word ow_objekt_0023Tiles+(0*0x800)
16506
+.hword 0x800
16507
+.hword 0x0
16508
+.word ow_objekt_0023Tiles+(1*0x800)
16509
+.hword 0x800
16510
+.hword 0x0
16511
+.word ow_objekt_0023Tiles+(2*0x800)
16512
+.hword 0x800
16513
+.hword 0x0
16514
+.word ow_objekt_0023Tiles+(3*0x800)
16515
+.hword 0x800
16498
 .hword 0x0
16516
 .hword 0x0
16499
 
16517
 
16500
 .align 2
16518
 .align 2
16501
 ow_frames_objekt_0024:
16519
 ow_frames_objekt_0024:
16502
-.word ow_00000Tiles+(0*0x80)
16503
-.hword 0x80
16520
+.word ow_objekt_0024Tiles+(0*0x800)
16521
+.hword 0x800
16504
 .hword 0x0
16522
 .hword 0x0
16505
 
16523
 
16506
 .align 2
16524
 .align 2

+ 399
- 692
data/overworld/wild_pokemon_data.s
File diff suppressed because it is too large
View File


+ 1
- 1
sots-private

1
-Subproject commit 8ef015aa70ee643252334b7d41b7dfb28f49218d
1
+Subproject commit b9e6182fa37ea4384ad12c9d09ec187a2b73ed61