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

refractor for easier integration of external submodules

Philipp Auer 7 years ago
parent
478ccdd0ba
commit
4eb02187c2
14 changed files with 75 additions and 70 deletions
Unified View Show Diff Stats
  1. 1
    1
      battle_engine
  2. 7
    2
      bpre.sym
  3. 2
    2
      data/pkmn_tables/pokemon_back_sprites.S
  4. 2
    2
      data/pkmn_tables/pokemon_front_sprites.S
  5. 2
    2
      data/pkmn_tables/pokemon_normal_pal.S
  6. 2
    2
      data/pkmn_tables/pokemon_player_y_table.s
  7. 2
    2
      data/pkmn_tables/pokemon_shiny_pal.S
  8. 2
    2
      data/raw_defines.s
  9. 8
    8
      patches/pokemon_data/player_y_table.asm
  10. 10
    10
      patches/pokemon_data/pokemon_back_sprites.asm
  11. 28
    28
      patches/pokemon_data/pokemon_front_sprites.asm
  12. 5
    5
      patches/pokemon_data/pokemon_normal_pal.asm
  13. 3
    3
      patches/pokemon_data/pokemon_shiny_pal.asm
  14. 1
    1
      src/include/objects.h

+ 1
- 1
battle_engine

1 
-Subproject commit a5e46479febfe3d780ac3111ebbb9401940983b5
1 
+Subproject commit b592aa051cd69667879b31b7247ed6c5fe275dcd

+ 7
- 2
bpre.sym View File

199
199
200 
 current_oe_state = 0x020386E0;
200 
 current_oe_state = 0x020386E0;
201
201
202 
-__aeabi_idiv = 0x081E4018|1;
202 
+/*__aeabi_idiv = 0x081E4018|1;
203 
 __aeabi_idivmod = 0x081E40F4|1;
203 
 __aeabi_idivmod = 0x081E40F4|1;
204 
 __aeabi_uidiv = 0x081E460C|1;
204 
 __aeabi_uidiv = 0x081E460C|1;
205 
-__aeabi_uidivmod = 0x081E4684|1;
205 
+__aeabi_uidivmod = 0x081E4684|1;*/
206 
+
207 
+__aeabi_idiv = 0x081E3B68|1;
208 
+__aeabi_idivmod = 0x081E3B68|1;
209 
+__aeabi_uidiv = 0x081E3B68|1;
210 
+__aeabi_uidivmod = 0x081E3B68|1;

+ 2
- 2
data/pkmn_tables/pokemon_back_sprites.S View File

1 
 .text
1 
 .text
2 
 .align 2
2 
 .align 2
3 
-.global pokemon_back_sprites
4 
-pokemon_back_sprites:
3 
+.global pokemon_graphics_back
4 
+pokemon_graphics_back:
5
5
6 
 .word back_0000Tiles, 0
6 
 .word back_0000Tiles, 0
7 
 .word back_0001Tiles, 1
7 
 .word back_0001Tiles, 1

+ 2
- 2
data/pkmn_tables/pokemon_front_sprites.S View File

1 
 .text
1 
 .text
2 
 .align 2
2 
 .align 2
3 
-.global pokemon_front_sprites
4 
-pokemon_front_sprites:
3 
+.global pokemon_graphics_front
4 
+pokemon_graphics_front:
5
5
6 
 .word front_0000Tiles, 0
6 
 .word front_0000Tiles, 0
7 
 .word front_0001Tiles, 1
7 
 .word front_0001Tiles, 1

+ 2
- 2
data/pkmn_tables/pokemon_normal_pal.S View File

1 
 .text
1 
 .text
2 
 .align 2
2 
 .align 2
3 
-.global pokemon_normal_pal
4 
-pokemon_normal_pal:
3 
+.global pokemon_palette_normal
4 
+pokemon_palette_normal:
5
5
6 
 .word n_p_0000Pal, 0x0
6 
 .word n_p_0000Pal, 0x0
7 
 .word n_p_0001Pal, 0x0
7 
 .word n_p_0001Pal, 0x0

+ 2
- 2
data/pkmn_tables/pokemon_player_y_table.s View File

2 
 .thumb
2 
 .thumb
3 
 .text
3 
 .text
4
4
5 
-.global pokemon_player_y_table
6 
-pokemon_player_y_table:
5 
+.global pokemon_player_xy_table
6 
+pokemon_player_xy_table:
7 
 .incbin "data/pkmn_tables/pkmn_player_y_table_dump.bin"
 7 
 .incbin "data/pkmn_tables/pkmn_player_y_table_dump.bin"

+ 2
- 2
data/pkmn_tables/pokemon_shiny_pal.S View File

1 
 .text
1 
 .text
2 
 .align 2
2 
 .align 2
3 
-.global pokemon_shiny_pal
4 
-pokemon_shiny_pal:
3 
+.global pokemon_palette_shiny
4 
+pokemon_palette_shiny:
5
5
6 
 .word s_p_0000Pal, 0x0
6 
 .word s_p_0000Pal, 0x0
7 
 .word s_p_0001Pal, 0x0
7 
 .word s_p_0001Pal, 0x0

+ 2
- 2
data/raw_defines.s View File

2 
 .thumb
2 
 .thumb
3 
 .text
3 
 .text
4
4
5 
-.global objects
5 
+/*.global objects
6 
 objects:
6 
 objects:
7 
-    .word 0x0202063C
7 
+    .word 0x0202063C*/
8
8
9 
 .global evolutions
9 
 .global evolutions
10 
 evolutions:
10 
 evolutions:

+ 8
- 8
patches/pokemon_data/player_y_table.asm View File

1 
 .org 0x08074634
1 
 .org 0x08074634
2 
-.word pokemon_player_y_table
2 
+.word pokemon_player_xy_table
3
3
4 
 .org 0x08074664
4 
 .org 0x08074664
5 
-.word pokemon_player_y_table
5 
+.word pokemon_player_xy_table
6
6
7 
 .org 0x08074670
7 
 .org 0x08074670
8 
-.word pokemon_player_y_table
8 
+.word pokemon_player_xy_table
9
9
10 
 .org 0x08076564
10 
 .org 0x08076564
11 
-.word pokemon_player_y_table
11 
+.word pokemon_player_xy_table
12
12
13 
 .org 0x08076B1C
13 
 .org 0x08076B1C
14 
-.word pokemon_player_y_table
14 
+.word pokemon_player_xy_table
15
15
16 
 .org 0x08076BE8
16 
 .org 0x08076BE8
17 
-.word pokemon_player_y_table
17 
+.word pokemon_player_xy_table
18
18
19 
 .org 0x08076BF8
19 
 .org 0x08076BF8
20 
-.word pokemon_player_y_table
20 
+.word pokemon_player_xy_table
21
21
22 
 .org 0x08076C04
22 
 .org 0x08076C04
23 
-.word pokemon_player_y_table
23 
+.word pokemon_player_xy_table
24
24

+ 10
- 10
patches/pokemon_data/pokemon_back_sprites.asm View File

1 
 .org 0x0800012C
1 
 .org 0x0800012C
2 
-.word pokemon_back_sprites
2 
+.word pokemon_graphics_back
3
3
4 
 .org 0x0800ED58
4 
 .org 0x0800ED58
5 
-.word pokemon_back_sprites
5 
+.word pokemon_graphics_back
6
6
7 
 .org 0x0800F19C
7 
 .org 0x0800F19C
8 
-.word pokemon_back_sprites
8 
+.word pokemon_graphics_back
9
9
10 
 .org 0x08034540
10 
 .org 0x08034540
11 
-.word pokemon_back_sprites
11 
+.word pokemon_graphics_back
12
12
13 
 .org 0x08034584
13 
 .org 0x08034584
14 
-.word pokemon_back_sprites
14 
+.word pokemon_graphics_back
15
15
16 
 .org 0x08034F04
16 
 .org 0x08034F04
17 
-.word pokemon_back_sprites
17 
+.word pokemon_graphics_back
18
18
19 
 .org 0x08076A58
19 
 .org 0x08076A58
20 
-.word pokemon_back_sprites
20 
+.word pokemon_graphics_back
21
21
22 
 .org 0x08076AC8
22 
 .org 0x08076AC8
23 
-.word pokemon_back_sprites
23 
+.word pokemon_graphics_back
24
24
25 
 .org 0x0810BC0C
25 
 .org 0x0810BC0C
26 
-.word pokemon_back_sprites
26 
+.word pokemon_graphics_back
27
27
28 
 .org 0x0810BC24
28 
 .org 0x0810BC24
29 
-.word pokemon_back_sprites
29 
+.word pokemon_graphics_back
30
30

+ 28
- 28
patches/pokemon_data/pokemon_front_sprites.asm View File

1 
 .org 0x08000128
1 
 .org 0x08000128
2 
-.word pokemon_front_sprites
2 
+.word pokemon_graphics_front
3
3
4 
 .org 0x0800ECA8
4 
 .org 0x0800ECA8
5 
-.word pokemon_front_sprites
5 
+.word pokemon_graphics_front
6
6
7 
 .org 0x0800ECEC
7 
 .org 0x0800ECEC
8 
-.word pokemon_front_sprites
8 
+.word pokemon_graphics_front
9
9
10 
 .org 0x0800ED68
10 
 .org 0x0800ED68
11 
-.word pokemon_front_sprites
11 
+.word pokemon_graphics_front
12
12
13 
 .org 0x0800ED80
13 
 .org 0x0800ED80
14 
-.word pokemon_front_sprites
14 
+.word pokemon_graphics_front
15
15
16 
 .org 0x0800F0F8
16 
 .org 0x0800F0F8
17 
-.word pokemon_front_sprites
17 
+.word pokemon_graphics_front
18
18
19 
 .org 0x0800F130
19 
 .org 0x0800F130
20 
-.word pokemon_front_sprites
20 
+.word pokemon_graphics_front
21
21
22 
 .org 0x0800F1AC
22 
 .org 0x0800F1AC
23 
-.word pokemon_front_sprites
23 
+.word pokemon_graphics_front
24
24
25 
 .org 0x0800F1C4
25 
 .org 0x0800F1C4
26 
-.word pokemon_front_sprites
26 
+.word pokemon_graphics_front
27
27
28 
 .org 0x080343C4
28 
 .org 0x080343C4
29 
-.word pokemon_front_sprites
29 
+.word pokemon_graphics_front
30
30
31 
 .org 0x08034D60
31 
 .org 0x08034D60
32 
-.word pokemon_front_sprites
32 
+.word pokemon_graphics_front
33
33
34 
 .org 0x0803507C
34 
 .org 0x0803507C
35 
-.word pokemon_front_sprites
35 
+.word pokemon_graphics_front
36
36
37 
 .org 0x08046F64
37 
 .org 0x08046F64
38 
-.word pokemon_front_sprites
38 
+.word pokemon_graphics_front
39
39
40 
 .org 0x08050074
40 
 .org 0x08050074
41 
-.word pokemon_front_sprites
41 
+.word pokemon_graphics_front
42
42
43 
 .org 0x080500BC
43 
 .org 0x080500BC
44 
-.word pokemon_front_sprites
44 
+.word pokemon_graphics_front
45
45
46 
 .org 0x08052068
46 
 .org 0x08052068
47 
-.word pokemon_front_sprites
47 
+.word pokemon_graphics_front
48
48
49 
 .org 0x080534C4
49 
 .org 0x080534C4
50 
-.word pokemon_front_sprites
50 
+.word pokemon_graphics_front
51
51
52 
 .org 0x080769C0
52 
 .org 0x080769C0
53 
-.word pokemon_front_sprites
53 
+.word pokemon_graphics_front
54
54
55 
 .org 0x080769E4
55 
 .org 0x080769E4
56 
-.word pokemon_front_sprites
56 
+.word pokemon_graphics_front
57
57
58 
 .org 0x0808F470
58 
 .org 0x0808F470
59 
-.word pokemon_front_sprites
59 
+.word pokemon_graphics_front
60
60
61 
 .org 0x080CE0B8
61 
 .org 0x080CE0B8
62 
-.word pokemon_front_sprites
62 
+.word pokemon_graphics_front
63
63
64 
 .org 0x080CE2B8
64 
 .org 0x080CE2B8
65 
-.word pokemon_front_sprites
65 
+.word pokemon_graphics_front
66
66
67 
 .org 0x080CE454
67 
 .org 0x080CE454
68 
-.word pokemon_front_sprites
68 
+.word pokemon_graphics_front
69
69
70 
 .org 0x080CE6C4
70 
 .org 0x080CE6C4
71 
-.word pokemon_front_sprites
71 
+.word pokemon_graphics_front
72
72
73 
 .org 0x0810BBE4
73 
 .org 0x0810BBE4
74 
-.word pokemon_front_sprites
74 
+.word pokemon_graphics_front
75
75
76 
 .org 0x0810BBF0
76 
 .org 0x0810BBF0
77 
-.word pokemon_front_sprites
77 
+.word pokemon_graphics_front
78
78
79 
 .org 0x0811D900
79 
 .org 0x0811D900
80 
-.word pokemon_front_sprites
80 
+.word pokemon_graphics_front
81
81
82 
 .org 0x0814AED8
82 
 .org 0x0814AED8
83 
-.word pokemon_front_sprites
83 
+.word pokemon_graphics_front
84
84

+ 5
- 5
patches/pokemon_data/pokemon_normal_pal.asm View File

1 
 .org 0x08000130
1 
 .org 0x08000130
2 
-.word pokemon_normal_pal
2 
+.word pokemon_palette_normal
3
3
4 
 .org 0x0804410C
4 
 .org 0x0804410C
5 
-.word pokemon_normal_pal
5 
+.word pokemon_palette_normal
6
6
7 
 .org 0x08044130
7 
 .org 0x08044130
8 
-.word pokemon_normal_pal
8 
+.word pokemon_palette_normal
9
9
10 
 .org 0x080441A4
10 
 .org 0x080441A4
11 
-.word pokemon_normal_pal
11 
+.word pokemon_palette_normal
12
12
13 
 .org 0x080839C0
13 
 .org 0x080839C0
14 
-.word pokemon_normal_pal
14 
+.word pokemon_palette_normal
15
15

+ 3
- 3
patches/pokemon_data/pokemon_shiny_pal.asm View File

1 
 .org 0x08000134
1 
 .org 0x08000134
2 
-.word pokemon_shiny_pal
2 
+.word pokemon_palette_shiny
3
3
4 
 .org 0x08044144
4 
 .org 0x08044144
5 
-.word pokemon_shiny_pal
5 
+.word pokemon_palette_shiny
6
6
7 
 .org 0x080441B4
7 
 .org 0x080441B4
8 
-.word pokemon_shiny_pal
8 
+.word pokemon_palette_shiny
9
9

+ 1
- 1
src/include/objects.h View File

84 
   u8 field43;
 84 
   u8 field43;
85 
 };
 85 
 };
86
86
87 
-extern struct obj_entity* objects;
87 
+extern struct obj_entity objects[64];
88
88
89 
 typedef void (*object_callback)(struct obj_entity*);
 89 
 typedef void (*object_callback)(struct obj_entity*);
90
90