Browse Source

add line endings

SBird1337 7 years ago
parent
commit
8bc05ce05a
71 changed files with 169 additions and 169 deletions
  1. 1
    1
      battle_engine
  2. 1
    1
      data/item/item_gfx.s
  3. 1
    1
      data/item/item_scripts.s
  4. 1
    1
      data/item/tm_hm_move_table.s
  5. 1
    1
      data/moves/move_data.s
  6. 1
    1
      data/moves/move_descriptions.s
  7. 89
    89
      data/overworld/oe_effect_table.s
  8. 1
    1
      data/overworld/overworld_data.s
  9. 1
    1
      data/overworld/overworld_frames.s
  10. 1
    1
      data/overworld/overworld_pal_table.s
  11. 1
    1
      data/overworld/overworld_tables.s
  12. 1
    1
      data/overworld/wild_pokemon_data.s
  13. 1
    1
      data/pkmn_tables/icon_sprites.s
  14. 1
    1
      data/pkmn_tables/icons_paletten.s
  15. 1
    1
      data/pkmn_tables/pokedex_order.s
  16. 1
    1
      data/pkmn_tables/pokemon_back_sprites.s
  17. 1
    1
      data/pkmn_tables/pokemon_egg_moves.s
  18. 1
    1
      data/pkmn_tables/pokemon_enemy_altitude_table.s
  19. 1
    1
      data/pkmn_tables/pokemon_enemy_y_table.s
  20. 1
    1
      data/pkmn_tables/pokemon_front_sprites.s
  21. 1
    1
      data/pkmn_tables/pokemon_habitats.s
  22. 1
    1
      data/pkmn_tables/pokemon_move_tutor.s
  23. 1
    1
      data/pkmn_tables/pokemon_moveset_table.s
  24. 1
    1
      data/pkmn_tables/pokemon_normal_pal.s
  25. 1
    1
      data/pkmn_tables/pokemon_player_y_table.s
  26. 1
    1
      data/pkmn_tables/pokemon_shiny_pal.s
  27. 1
    1
      data/pkmn_tables/pokemon_stats.s
  28. 1
    1
      data/string/map_names.s
  29. 11
    11
      data/string/rival_names.s
  30. 1
    1
      data/text_lookup/text_lookup_array.s
  31. 1
    1
      data/text_lookup/text_multichoice.s
  32. 1
    1
      data/trainer/trainer_pkmn_data.s
  33. 1
    1
      data/trainer/ts_alt.s
  34. 1
    1
      data/trainer/ts_pal.s
  35. 1
    1
      data/trainer/ts_tiles.s
  36. 1
    1
      src/battle_bg/battle_bg_hook.s
  37. 1
    1
      src/battle_engine/battle_m_flee_hook.s
  38. 1
    1
      src/battle_engine/custom_structs_malloc_hook.s
  39. 1
    1
      src/battle_engine/scripts/hazards.s
  40. 1
    1
      src/interface/lcd_io_test.s
  41. 1
    1
      src/interface/textbox_setup.s
  42. 1
    1
      src/item/tmhm/tm_compatability.s
  43. 1
    1
      src/item/tmhm/tm_index.s
  44. 1
    1
      src/item/tmhm/tm_index_fix.s
  45. 1
    1
      src/item/tmhm/tm_number.s
  46. 1
    1
      src/item/tmhm/tm_save_block.s
  47. 1
    1
      src/moves/battle_engine/bs_table.s
  48. 1
    1
      src/moves/battle_engine/cmd_callasm.s
  49. 1
    1
      src/moves/battle_engine/cmd_setword.s
  50. 1
    1
      src/moves/battle_engine/custom_print_string.s
  51. 1
    1
      src/moves/battle_engine/new_move_first.s
  52. 1
    1
      src/moves/battle_engine/new_move_second.s
  53. 1
    1
      src/moves/battle_engine/new_move_third.s
  54. 1
    1
      src/moves/crush_grip_like/crush_grip_like_script.s
  55. 1
    1
      src/moves/fang_moves/fang_effect.s
  56. 1
    1
      src/moves/feint/feint_scripts.s
  57. 1
    1
      src/moves/flare_blitz/flare_blitz_script.s
  58. 1
    1
      src/moves/gastro_acid/gastro_acid_script.s
  59. 1
    1
      src/moves/hazards/hazards_scripts.s
  60. 1
    1
      src/moves/lucky_chant/lucky_chant_script.s
  61. 1
    1
      src/moves/metal_burst/metal_burst_script.s
  62. 1
    1
      src/moves/pay_back/pay_back_script.s
  63. 1
    1
      src/moves/power_trick/power_trick_script.s
  64. 1
    1
      src/moves/roost/roost_scripts.s
  65. 1
    1
      src/moves/uturn/u_turn_script.s
  66. 1
    1
      src/overworld/dyn_npc_hooks.s
  67. 1
    1
      src/overworld/overworld_hooks.s
  68. 1
    1
      src/player_interaction/jump_behavior.s
  69. 1
    1
      src/player_interaction/on_step.s
  70. 1
    1
      src/test/test_scripts.s
  71. 1
    1
      todo/pokemon_evolution.s

+ 1
- 1
battle_engine

1
-Subproject commit a201b518834f0208efdb82ac95b08675f5279950
1
+Subproject commit 4a4fb7ac2ac3def1d4270796bdd2c04e8231d382

+ 1
- 1
data/item/item_gfx.s View File

691
 .word item_682Tiles, item_682Pal
691
 .word item_682Tiles, item_682Pal
692
 .word item_683Tiles, item_683Pal
692
 .word item_683Tiles, item_683Pal
693
 .word item_684Tiles, item_684Pal
693
 .word item_684Tiles, item_684Pal
694
-.word item_685Tiles, item_685Pal
694
+.word item_685Tiles, item_685Pal

+ 1
- 1
data/item/item_scripts.s View File

945
 itemflag_stromisierer:
945
 itemflag_stromisierer:
946
 .byte 0x0, 0x0, 0x0, 0x0, 0x80, 0x0
946
 .byte 0x0, 0x0, 0x0, 0x0, 0x80, 0x0
947
 itemflag_eisstein:
947
 itemflag_eisstein:
948
-.byte 0x0, 0x0, 0x0, 0x0, 0x80, 0x0
948
+.byte 0x0, 0x0, 0x0, 0x0, 0x80, 0x0

+ 1
- 1
data/item/tm_hm_move_table.s View File

133
 .hword 0x29A
133
 .hword 0x29A
134
 .hword 0x1A0
134
 .hword 0x1A0
135
 .hword 0x18D
135
 .hword 0x18D
136
-.hword 0x2A4
136
+.hword 0x2A4

+ 1
- 1
data/moves/move_data.s View File

685
 /*Multi_Angriff*/	move_data_672:	.byte		NONE,		90,		0,		100,		10,		0,		0,		0,		51,		0,		0,		0
685
 /*Multi_Angriff*/	move_data_672:	.byte		NONE,		90,		0,		100,		10,		0,		0,		0,		51,		0,		0,		0
686
 /*aeonensturm*/		move_data_673:	.byte		0,		120,		16,		90,		35,		0,		8,		0,		50,		0,		1,		0
686
 /*aeonensturm*/		move_data_673:	.byte		0,		120,		16,		90,		35,		0,		8,		0,		50,		0,		1,		0
687
 /*aeonenstrahl*/	move_data_674:	.byte		0,		120,		16,		90,		35,		0,		8,		0,		50,		0,		1,		0
687
 /*aeonenstrahl*/	move_data_674:	.byte		0,		120,		16,		90,		35,		0,		8,		0,		50,		0,		1,		0
688
-/*DNS_Strahl*/		move_data_675:	.byte		0,		150,		14,		90,		5,		0,		8,		0,		48,		0,		1,		0
688
+/*DNS_Strahl*/		move_data_675:	.byte		0,		150,		14,		90,		5,		0,		8,		0,		48,		0,		1,		0

+ 1
- 1
data/moves/move_descriptions.s View File

626
 .word str_move_description_621
626
 .word str_move_description_621
627
 .word str_move_description_622
627
 .word str_move_description_622
628
 .word str_move_description_623
628
 .word str_move_description_623
629
-.word str_move_description_624
629
+.word str_move_description_624

+ 89
- 89
data/overworld/oe_effect_table.s View File

1
-.align 2
2
-.thumb
3
-.text
4
-
5
-.global oe_effect_table
6
-oe_effect_table:
7
-
8
-.word 0x081D97C4 @0x00
9
-.word 0x081D97CA @0x01
10
-.word 0x081D97D0 @0x02
11
-.word 0x081D97D6 @0x03
12
-.word oea_grass @0x04 grass animation
13
-.word 0x081D97E6 @0x05
14
-.word 0x081D97F0 @0x06
15
-.word 0x081D97F6 @0x07
16
-.word 0x081D9800 @0x08
17
-.word 0x081D9806 @0x09
18
-.word 0x081D980C @0x0A
19
-.word 0x081D9816 @0x0B
20
-.word 0x081D9817 @0x0C
21
-.word 0x081D9821 @0x0D
22
-.word 0x081D982B @0x0E
23
-.word 0x081D9835 @0x0F
24
-.word 0x081D983F @0x10
25
-.word 0x081D9849 @0x11
26
-.word 0x081D9853 @0x12
27
-.word 0x081D985D @0x13
28
-.word 0x081D9867 @0x14
29
-.word 0x081D9871 @0x15
30
-.word 0x081D987B @0x16
31
-.word 0x081D9885 @0x17
32
-.word 0x081D988B @0x18
33
-.word 0x081D9895 @0x19
34
-.word 0x081D98A4 @0x1A
35
-.word 0x081D98A5 @0x1B
36
-.word 0x081D98A6 @0x1C
37
-.word 0x081D98AC @0x1D
38
-.word 0x081D98B2 @0x1E
39
-.word 0x081D98B8 @0x1F
40
-.word 0x081D98BE @0x20
41
-.word 0x081D98C4 @0x21
42
-.word 0x081D98CA @0x22
43
-.word 0x081D98D4 @0x23
44
-.word 0x081D98DE @0x24
45
-.word 0x081D98E4 @0x25
46
-.word 0x081D98F0 @0x26
47
-.word 0x081D98F6 @0x27
48
-.word 0x081D98EA @0x28
49
-.word 0x081D9900 @0x29
50
-.word 0x081D990A @0x2A
51
-.word 0x081D9914 @0x2B
52
-.word 0x081D991A @0x2C
53
-.word 0x081D9920 @0x2D
54
-.word 0x081D992B @0x2E
55
-.word 0x081D9931 @0x2F
56
-.word 0x081D9932 @0x30
57
-.word 0x081D9933 @0x31
58
-.word 0x081D993D @0x32
59
-.word 0x081D9947 @0x33
60
-.word 0x081D994D @0x34
61
-.word 0x081D994E @0x35
62
-.word 0x081D9958 @0x36
63
-.word 0x081D9962 @0x37
64
-.word 0x081D9963 @0x38
65
-.word 0x081D9964 @0x39
66
-.word 0x081D9965 @0x3A
67
-.word 0x081D996F @0x3B
68
-.word 0x081D9975 @0x3C
69
-.word 0x081D9976 @0x3D
70
-.word 0x081D9977 @0x3E
71
-.word 0x081D9986 @0x3F
72
-.word 0x081D998C @0x40
73
-.word 0x081D9992 @0x41
74
-.word 0x081D9998 @0x42
75
-.word 0x081D999E @0x43
76
-.word 0x081D99A4 @0x44
77
-.word 0x081D99AA @0x45
78
-
79
-oea_grass:
80
-.byte 7
81
-.word oe_pal_grass_normal
82
-.word oei_grass_normal+1
83
-.byte 4
84
-
85
-.align 2
86
-
87
-oe_pal_grass_normal:
88
-.word oea_grass_normalPal
89
-.hword 0x1005
1
+.align 2
2
+.thumb
3
+.text
4
+
5
+.global oe_effect_table
6
+oe_effect_table:
7
+
8
+.word 0x081D97C4 @0x00
9
+.word 0x081D97CA @0x01
10
+.word 0x081D97D0 @0x02
11
+.word 0x081D97D6 @0x03
12
+.word oea_grass @0x04 grass animation
13
+.word 0x081D97E6 @0x05
14
+.word 0x081D97F0 @0x06
15
+.word 0x081D97F6 @0x07
16
+.word 0x081D9800 @0x08
17
+.word 0x081D9806 @0x09
18
+.word 0x081D980C @0x0A
19
+.word 0x081D9816 @0x0B
20
+.word 0x081D9817 @0x0C
21
+.word 0x081D9821 @0x0D
22
+.word 0x081D982B @0x0E
23
+.word 0x081D9835 @0x0F
24
+.word 0x081D983F @0x10
25
+.word 0x081D9849 @0x11
26
+.word 0x081D9853 @0x12
27
+.word 0x081D985D @0x13
28
+.word 0x081D9867 @0x14
29
+.word 0x081D9871 @0x15
30
+.word 0x081D987B @0x16
31
+.word 0x081D9885 @0x17
32
+.word 0x081D988B @0x18
33
+.word 0x081D9895 @0x19
34
+.word 0x081D98A4 @0x1A
35
+.word 0x081D98A5 @0x1B
36
+.word 0x081D98A6 @0x1C
37
+.word 0x081D98AC @0x1D
38
+.word 0x081D98B2 @0x1E
39
+.word 0x081D98B8 @0x1F
40
+.word 0x081D98BE @0x20
41
+.word 0x081D98C4 @0x21
42
+.word 0x081D98CA @0x22
43
+.word 0x081D98D4 @0x23
44
+.word 0x081D98DE @0x24
45
+.word 0x081D98E4 @0x25
46
+.word 0x081D98F0 @0x26
47
+.word 0x081D98F6 @0x27
48
+.word 0x081D98EA @0x28
49
+.word 0x081D9900 @0x29
50
+.word 0x081D990A @0x2A
51
+.word 0x081D9914 @0x2B
52
+.word 0x081D991A @0x2C
53
+.word 0x081D9920 @0x2D
54
+.word 0x081D992B @0x2E
55
+.word 0x081D9931 @0x2F
56
+.word 0x081D9932 @0x30
57
+.word 0x081D9933 @0x31
58
+.word 0x081D993D @0x32
59
+.word 0x081D9947 @0x33
60
+.word 0x081D994D @0x34
61
+.word 0x081D994E @0x35
62
+.word 0x081D9958 @0x36
63
+.word 0x081D9962 @0x37
64
+.word 0x081D9963 @0x38
65
+.word 0x081D9964 @0x39
66
+.word 0x081D9965 @0x3A
67
+.word 0x081D996F @0x3B
68
+.word 0x081D9975 @0x3C
69
+.word 0x081D9976 @0x3D
70
+.word 0x081D9977 @0x3E
71
+.word 0x081D9986 @0x3F
72
+.word 0x081D998C @0x40
73
+.word 0x081D9992 @0x41
74
+.word 0x081D9998 @0x42
75
+.word 0x081D999E @0x43
76
+.word 0x081D99A4 @0x44
77
+.word 0x081D99AA @0x45
78
+
79
+oea_grass:
80
+.byte 7
81
+.word oe_pal_grass_normal
82
+.word oei_grass_normal+1
83
+.byte 4
84
+
85
+.align 2
86
+
87
+oe_pal_grass_normal:
88
+.word oea_grass_normalPal
89
+.hword 0x1005

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

6144
 .hword 0xFFFF
6144
 .hword 0xFFFF
6145
 .byte 0xFF, 0x13, 0xFF, 0x11
6145
 .byte 0xFF, 0x13, 0xFF, 0x11
6146
 .hword 0x80, 0x10, 0x10, 0x0, 0
6146
 .hword 0x80, 0x10, 0x10, 0x0, 0
6147
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_767, 0x8231CFC
6147
+.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_767, 0x8231CFC

+ 1
- 1
data/overworld/overworld_frames.s View File

16534
 ow_frames_767:
16534
 ow_frames_767:
16535
 .word ow_00000Tiles+(0*0x80)
16535
 .word ow_00000Tiles+(0*0x80)
16536
 .hword 0x80
16536
 .hword 0x80
16537
-.hword 0x0
16537
+.hword 0x0

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

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

+ 1
- 1
data/overworld/overworld_tables.s View File

787
 .word ow_data_764
787
 .word ow_data_764
788
 .word ow_data_765
788
 .word ow_data_765
789
 .word ow_data_766
789
 .word ow_data_766
790
-.word ow_data_767
790
+.word ow_data_767

+ 1
- 1
data/overworld/wild_pokemon_data.s View File

1261
 .byte 0x32 
1261
 .byte 0x32 
1262
 .byte 0x37 
1262
 .byte 0x37 
1263
 .hword 0x8D
1263
 .hword 0x8D
1264
-.hword 0xFFFF
1264
+.hword 0xFFFF

+ 1
- 1
data/pkmn_tables/icon_sprites.s View File

1204
 .word icon_1196Tiles
1204
 .word icon_1196Tiles
1205
 .word icon_1197Tiles
1205
 .word icon_1197Tiles
1206
 .word icon_1198Tiles
1206
 .word icon_1198Tiles
1207
-.word icon_1199Tiles
1207
+.word icon_1199Tiles

+ 1
- 1
data/pkmn_tables/icons_paletten.s View File

1203
 .byte 00 
1203
 .byte 00 
1204
 .byte 00 
1204
 .byte 00 
1205
 .byte 00 
1205
 .byte 00 
1206
-.byte 00 
1206
+.byte 00 

+ 1
- 1
data/pkmn_tables/pokedex_order.s View File

1202
 .hword 219
1202
 .hword 219
1203
 .hword 219
1203
 .hword 219
1204
 .hword 219
1204
 .hword 219
1205
-.hword 219
1205
+.hword 219

+ 1
- 1
data/pkmn_tables/pokemon_back_sprites.s View File

1202
 .word back_1196Tiles, 1196
1202
 .word back_1196Tiles, 1196
1203
 .word back_1197Tiles, 1197
1203
 .word back_1197Tiles, 1197
1204
 .word back_1198Tiles, 1198
1204
 .word back_1198Tiles, 1198
1205
-.word back_1199Tiles, 1199
1205
+.word back_1199Tiles, 1199

+ 1
- 1
data/pkmn_tables/pokemon_egg_moves.s View File

4600
 .hword 0xFB
4600
 .hword 0xFB
4601
 .hword 0x30
4601
 .hword 0x30
4602
 .hword 0x185
4602
 .hword 0x185
4603
-.hword 0x1F2
4603
+.hword 0x1F2

+ 1
- 1
data/pkmn_tables/pokemon_enemy_altitude_table.s View File

4
 
4
 
5
 .global pkmn_enemy_altitude_table
5
 .global pkmn_enemy_altitude_table
6
 pkmn_enemy_altitude_table:
6
 pkmn_enemy_altitude_table:
7
-.incbin "data/pkmn_tables/pkmn_enemy_altitude_table_dump.bin"
7
+.incbin "data/pkmn_tables/pkmn_enemy_altitude_table_dump.bin"

+ 1
- 1
data/pkmn_tables/pokemon_enemy_y_table.s View File

4
 
4
 
5
 .global pokemon_enemy_y_table
5
 .global pokemon_enemy_y_table
6
 pokemon_enemy_y_table:
6
 pokemon_enemy_y_table:
7
-.incbin "data/pkmn_tables/pkmn_enemy_y_table_dump.bin"
7
+.incbin "data/pkmn_tables/pkmn_enemy_y_table_dump.bin"

+ 1
- 1
data/pkmn_tables/pokemon_front_sprites.s View File

1202
 .word front_1196Tiles, 1196
1202
 .word front_1196Tiles, 1196
1203
 .word front_1197Tiles, 1197
1203
 .word front_1197Tiles, 1197
1204
 .word front_1198Tiles, 1198
1204
 .word front_1198Tiles, 1198
1205
-.word front_1199Tiles, 1199
1205
+.word front_1199Tiles, 1199

+ 1
- 1
data/pkmn_tables/pokemon_habitats.s View File

1541
 seite_selten_38:
1541
 seite_selten_38:
1542
 .hword 850, 851, 852, 853
1542
 .hword 850, 851, 852, 853
1543
 seite_selten_39:
1543
 seite_selten_39:
1544
-.hword 854
1544
+.hword 854

+ 1
- 1
data/pkmn_tables/pokemon_move_tutor.s View File

1200
 .byte 0, 0
1200
 .byte 0, 0
1201
 .byte 0, 0
1201
 .byte 0, 0
1202
 .byte 0, 0
1202
 .byte 0, 0
1203
-.byte 0, 0
1203
+.byte 0, 0

+ 1
- 1
data/pkmn_tables/pokemon_moveset_table.s View File

42830
 .hword 0x149 
42830
 .hword 0x149 
42831
 .byte 0x2D
42831
 .byte 0x2D
42832
 .hword 0x0 
42832
 .hword 0x0 
42833
-.byte 0xFF
42833
+.byte 0xFF

+ 1
- 1
data/pkmn_tables/pokemon_normal_pal.s View File

1202
 .word n_p_1196Pal, 0x0
1202
 .word n_p_1196Pal, 0x0
1203
 .word n_p_1197Pal, 0x0
1203
 .word n_p_1197Pal, 0x0
1204
 .word n_p_1198Pal, 0x0
1204
 .word n_p_1198Pal, 0x0
1205
-.word n_p_1199Pal, 0x0
1205
+.word n_p_1199Pal, 0x0

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

4
 
4
 
5
 .global pokemon_player_xy_table
5
 .global pokemon_player_xy_table
6
 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"

+ 1
- 1
data/pkmn_tables/pokemon_shiny_pal.s View File

1202
 .word s_p_1196Pal, 0x0
1202
 .word s_p_1196Pal, 0x0
1203
 .word s_p_1197Pal, 0x0
1203
 .word s_p_1197Pal, 0x0
1204
 .word s_p_1198Pal, 0x0
1204
 .word s_p_1198Pal, 0x0
1205
-.word s_p_1199Pal, 0x0
1205
+.word s_p_1199Pal, 0x0

+ 1
- 1
data/pkmn_tables/pokemon_stats.s View File

4801
 
4801
 
4802
 .byte 100, 100, 100, 100, 100, 100, 23, 3, 3, 255, 68, 1
4802
 .byte 100, 100, 100, 100, 100, 100, 23, 3, 3, 255, 68, 1
4803
 .hword 0, 0
4803
 .hword 0, 0
4804
-.byte 255, 20, 70, 5, 15, 15, 26, 0, 0, 4, 0, 0
4804
+.byte 255, 20, 70, 5, 15, 15, 26, 0, 0, 4, 0, 0

+ 1
- 1
data/string/map_names.s View File

91
 
91
 
92
 str_map_name_invalid:
92
 str_map_name_invalid:
93
 .string LAN_DE "Invalider Name"
93
 .string LAN_DE "Invalider Name"
94
-.string LAN_EN "Invalid Name"
94
+.string LAN_EN "Invalid Name"

+ 11
- 11
data/string/rival_names.s View File

1
-.align 2
2
-.thumb
3
-.text
4
-
5
-.global name_rival_male
6
-name_rival_male:
7
-    .string LAN_DE "Noah"
8
-
9
-.global name_rival_female
10
-name_rival_female:
11
-    .string LAN_DE "Emma"
1
+.align 2
2
+.thumb
3
+.text
4
+
5
+.global name_rival_male
6
+name_rival_male:
7
+    .string LAN_DE "Noah"
8
+
9
+.global name_rival_female
10
+name_rival_female:
11
+    .string LAN_DE "Emma"

+ 1
- 1
data/text_lookup/text_lookup_array.s View File

156
 
156
 
157
 .global text_lookup_table
157
 .global text_lookup_table
158
 text_lookup_table:
158
 text_lookup_table:
159
-    .word text_lookup_array
159
+    .word text_lookup_array

+ 1
- 1
data/text_lookup/text_multichoice.s View File

33
     .word str_left
33
     .word str_left
34
     .word 0
34
     .word 0
35
     .word str_right
35
     .word str_right
36
-    .word 0
36
+    .word 0

+ 1
- 1
data/trainer/trainer_pkmn_data.s View File

549
 .hword 100, 15, 934, 258, 301, 174, 232
549
 .hword 100, 15, 934, 258, 301, 174, 232
550
 .hword 100, 15, 936, 258, 204, 50, 109
550
 .hword 100, 15, 936, 258, 204, 50, 109
551
 .hword 100, 15, 385, 258, 181, 52, 55
551
 .hword 100, 15, 385, 258, 181, 52, 55
552
-.hword 100, 16, 91, 258, 182, 41, 350
552
+.hword 100, 16, 91, 258, 182, 41, 350

+ 1
- 1
data/trainer/ts_alt.s View File

253
 .hword	0x108, 0
253
 .hword	0x108, 0
254
 .hword	0x108, 0
254
 .hword	0x108, 0
255
 .hword	0x108, 0
255
 .hword	0x108, 0
256
-.hword	0x108, 0
256
+.hword	0x108, 0

+ 1
- 1
data/trainer/ts_pal.s View File

1031
 
1031
 
1032
 .word ts_0000Pal 
1032
 .word ts_0000Pal 
1033
 .hword 0 
1033
 .hword 0 
1034
-.hword 0
1034
+.hword 0

+ 1
- 1
data/trainer/ts_tiles.s View File

1031
 
1031
 
1032
 .word ts_0000Tiles 
1032
 .word ts_0000Tiles 
1033
 .hword 0x0800 
1033
 .hword 0x0800 
1034
-.hword 0
1034
+.hword 0

+ 1
- 1
src/battle_bg/battle_bg_hook.s View File

46
 bxr1:
46
 bxr1:
47
 	bx r1
47
 	bx r1
48
 bxr0:
48
 bxr0:
49
-	bx r0
49
+	bx r0

+ 1
- 1
src/battle_engine/battle_m_flee_hook.s View File

70
 
70
 
71
 setword STRING_LOADER str_deoxys_aura
71
 setword STRING_LOADER str_deoxys_aura
72
 printstring 0x184
72
 printstring 0x184
73
-end2
73
+end2

+ 1
- 1
src/battle_engine/custom_structs_malloc_hook.s View File

33
 
33
 
34
 free_routine:
34
 free_routine:
35
 ldr r3, =free
35
 ldr r3, =free
36
-bx r3
36
+bx r3

+ 1
- 1
src/battle_engine/scripts/hazards.s View File

81
 .align 2
81
 .align 2
82
 .global bs_toxic_resolve
82
 .global bs_toxic_resolve
83
 bs_toxic_resolve:
83
 bs_toxic_resolve:
84
-	.word bs_toxic_resolve_int
84
+	.word bs_toxic_resolve_int

+ 1
- 1
src/interface/lcd_io_test.s View File

165
 .hword 0
165
 .hword 0
166
 .hword 0
166
 .hword 0
167
 .hword 0
167
 .hword 0
168
-.hword 0x0
168
+.hword 0x0

+ 1
- 1
src/interface/textbox_setup.s View File

23
 pointer_bank:
23
 pointer_bank:
24
 	.word 0x03000F14
24
 	.word 0x03000F14
25
 
25
 
26
-	
26
+	

+ 1
- 1
src/item/tmhm/tm_compatability.s View File

67
 exit:
67
 exit:
68
 pop {r4-r5}
68
 pop {r4-r5}
69
 pop {r1}
69
 pop {r1}
70
-bx r1
70
+bx r1

+ 1
- 1
src/item/tmhm/tm_index.s View File

27
 ldr r1, =tm_hm_move_table
27
 ldr r1, =tm_hm_move_table
28
 add r0, r0, r1
28
 add r0, r0, r1
29
 ldrh r0, [r0]
29
 ldrh r0, [r0]
30
-bx lr
30
+bx lr

+ 1
- 1
src/item/tmhm/tm_index_fix.s View File

22
 
22
 
23
 int_to_str_routine:
23
 int_to_str_routine:
24
     ldr r4, =0x08008E78|1
24
     ldr r4, =0x08008E78|1
25
-    bx r4
25
+    bx r4

+ 1
- 1
src/item/tmhm/tm_number.s View File

46
 return3: .word 0x08131DAF
46
 return3: .word 0x08131DAF
47
 
47
 
48
 string_no:
48
 string_no:
49
-	.byte 0xF9, 0x08, 0xFC, 0x11, 0x01, 0xFF
49
+	.byte 0xF9, 0x08, 0xFC, 0x11, 0x01, 0xFF

+ 1
- 1
src/item/tmhm/tm_save_block.s View File

13
 
13
 
14
 .align
14
 .align
15
 tm_save: .word 0x0203cB10
15
 tm_save: .word 0x0203cB10
16
-return: .word 0x08099e74+1
16
+return: .word 0x08099e74+1

+ 1
- 1
src/moves/battle_engine/bs_table.s View File

7
 .incbin "src/moves/battle_engine/bs_table_d.bin"
7
 .incbin "src/moves/battle_engine/bs_table_d.bin"
8
 
8
 
9
 .word bs_callasm+1
9
 .word bs_callasm+1
10
-.word bs_setword+1
10
+.word bs_setword+1

+ 1
- 1
src/moves/battle_engine/cmd_callasm.s View File

29
 bx r0
29
 bx r0
30
 
30
 
31
 bxr1:
31
 bxr1:
32
-bx r1
32
+bx r1

+ 1
- 1
src/moves/battle_engine/cmd_setword.s View File

30
 add r0, #4
30
 add r0, #4
31
 ldr r1, =0x02023D74
31
 ldr r1, =0x02023D74
32
 str r0, [r1]
32
 str r0, [r1]
33
-bx lr
33
+bx lr

+ 1
- 1
src/moves/battle_engine/custom_print_string.s View File

48
 returnone:
48
 returnone:
49
 	.word 0x080D77DD
49
 	.word 0x080D77DD
50
 otherramloc:
50
 otherramloc:
51
-	.word 0x0202298C
51
+	.word 0x0202298C

+ 1
- 1
src/moves/battle_engine/new_move_first.s View File

38
 .align
38
 .align
39
 return:  .word 0x0803EB65
39
 return:  .word 0x0803EB65
40
 return2: .word 0x0803EB73
40
 return2: .word 0x0803EB73
41
-there:  .word 0x02024022
41
+there:  .word 0x02024022

+ 1
- 1
src/moves/battle_engine/new_move_second.s View File

64
  bx r7
64
  bx r7
65
 .align
65
 .align
66
 gothere: .word 0x0803E8B5
66
 gothere: .word 0x0803E8B5
67
-gothere2: .word 0x0803EC43
67
+gothere2: .word 0x0803EC43

+ 1
- 1
src/moves/battle_engine/new_move_third.s View File

107
  mov r10, r5
107
  mov r10, r5
108
  pop {r4-r7}
108
  pop {r4-r7}
109
  pop {r1}
109
  pop {r1}
110
- bx r1
110
+ bx r1

+ 1
- 1
src/moves/crush_grip_like/crush_grip_like_script.s View File

27
     faintpokemon 0x0 0x0 0x0
27
     faintpokemon 0x0 0x0 0x0
28
     setbyte 0x2023FD8 0x0
28
     setbyte 0x2023FD8 0x0
29
     cmd49 0x0 0x0
29
     cmd49 0x0 0x0
30
-    end
30
+    end

+ 1
- 1
src/moves/fang_moves/fang_effect.s View File

51
 waitmessage DELAY_1SECOND
51
 waitmessage DELAY_1SECOND
52
 resultmessage
52
 resultmessage
53
 waitmessage DELAY_1SECOND
53
 waitmessage DELAY_1SECOND
54
-return
54
+return

+ 1
- 1
src/moves/feint/feint_scripts.s View File

52
 
52
 
53
 .global bs_feint_no_break_ptr
53
 .global bs_feint_no_break_ptr
54
 bs_feint_no_break_ptr:
54
 bs_feint_no_break_ptr:
55
-    .word bs_feint_no_break
55
+    .word bs_feint_no_break

+ 1
- 1
src/moves/flare_blitz/flare_blitz_script.s View File

32
     seteffectwithchancetarget
32
     seteffectwithchancetarget
33
     setbyte 0x2023E85 0xE6
33
     setbyte 0x2023E85 0xE6
34
     seteffectwithchancetarget
34
     seteffectwithchancetarget
35
-    goto 0x81D6947
35
+    goto 0x81D6947

+ 1
- 1
src/moves/gastro_acid/gastro_acid_script.s View File

15
     setword STRING_LOADER str_gastro_acid
15
     setword STRING_LOADER str_gastro_acid
16
     printstring 0x184
16
     printstring 0x184
17
     waitmessage 0x40
17
     waitmessage 0x40
18
-    goto 0x081D694E
18
+    goto 0x081D694E

+ 1
- 1
src/moves/hazards/hazards_scripts.s View File

55
 waitmessage 0x40
55
 waitmessage 0x40
56
 setbyte 0x2023FD8 0x0
56
 setbyte 0x2023FD8 0x0
57
 cmd49 0x0 0x0
57
 cmd49 0x0 0x0
58
-end
58
+end

+ 1
- 1
src/moves/lucky_chant/lucky_chant_script.s View File

15
     setword STRING_LOADER str_lucky_chant
15
     setword STRING_LOADER str_lucky_chant
16
     printstring 0x184
16
     printstring 0x184
17
     waitmessage 0x40
17
     waitmessage 0x40
18
-    goto 0x081D694E
18
+    goto 0x081D694E

+ 1
- 1
src/moves/metal_burst/metal_burst_script.s View File

34
 .byte 0x00, 0x14, 0x28, 0x0A, 0x03, 0x2A, 0x01, 0x03, 0x1D, 0x8B, 0x09, 0x08, 0x02, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x01, 0x00, 0x0E, 0x16, 0x36, 0x1D, 0x08, 0x0E, 0x16, 0x36, 0x1D, 0x08, 0x0E, 0x16, 0x36, 0x1D, 0x08, 0x0E, 0x16, 0x36, 0x1D, 0x08
34
 .byte 0x00, 0x14, 0x28, 0x0A, 0x03, 0x2A, 0x01, 0x03, 0x1D, 0x8B, 0x09, 0x08, 0x02, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x00, 0x01, 0x00, 0x0E, 0x16, 0x36, 0x1D, 0x08, 0x0E, 0x16, 0x36, 0x1D, 0x08, 0x0E, 0x16, 0x36, 0x1D, 0x08, 0x0E, 0x16, 0x36, 0x1D, 0x08
35
 .byte 0x05, 0x0B, 0x03, 0x04, 0x00, 0x05, 0x00, 0xD6, 0x27, 0x19, 0xAA, 0x00, 0x3F, 0x04, 0x03, 0x02, 0x94, 0x3F, 0x3E, 0x08, 0x84, 0x04, 0xF0, 0xFF, 0xF1, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x19, 0xAA, 0x00, 0x3F, 0x04, 0x03, 0x02, 0x94, 0x3F, 0x3E, 0x08, 0x84, 0x04, 0x10, 0x00, 0xFB
35
 .byte 0x05, 0x0B, 0x03, 0x04, 0x00, 0x05, 0x00, 0xD6, 0x27, 0x19, 0xAA, 0x00, 0x3F, 0x04, 0x03, 0x02, 0x94, 0x3F, 0x3E, 0x08, 0x84, 0x04, 0xF0, 0xFF, 0xF1, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x19, 0xAA, 0x00, 0x3F, 0x04, 0x03, 0x02, 0x94, 0x3F, 0x3E, 0x08, 0x84, 0x04, 0x10, 0x00, 0xFB
36
 .byte 0xFF, 0x01, 0x00, 0x00, 0x00, 0x19, 0xAA, 0x00, 0x3F, 0x04, 0x03, 0x02, 0x94, 0x3F, 0x3E, 0x08, 0x84, 0x04, 0xF4, 0xFF, 0x12, 0x00, 0x01, 0x00, 0x00, 0x00, 0x19, 0xAA, 0x00, 0x3F, 0x04, 0x03, 0x02, 0x94, 0x3F, 0x3E, 0x08, 0x84, 0x04, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00
36
 .byte 0xFF, 0x01, 0x00, 0x00, 0x00, 0x19, 0xAA, 0x00, 0x3F, 0x04, 0x03, 0x02, 0x94, 0x3F, 0x3E, 0x08, 0x84, 0x04, 0xF4, 0xFF, 0x12, 0x00, 0x01, 0x00, 0x00, 0x00, 0x19, 0xAA, 0x00, 0x3F, 0x04, 0x03, 0x02, 0x94, 0x3F, 0x3E, 0x08, 0x84, 0x04, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00
37
-.byte 0x00, 0x19, 0xAA, 0x00, 0x3F, 0x04, 0x03, 0x05, 0x08
37
+.byte 0x00, 0x19, 0xAA, 0x00, 0x3F, 0x04, 0x03, 0x05, 0x08

+ 1
- 1
src/moves/pay_back/pay_back_script.s View File

24
     .byte 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x00, 0x19, 0x74, 0x00, 0x3F, 0x04, 0x01, 0x02, 0x10, 0x67
24
     .byte 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x00, 0x19, 0x74, 0x00, 0x3F, 0x04, 0x01, 0x02, 0x10, 0x67
25
     .byte 0x3E, 0x08, 0x03, 0x05, 0x0F, 0x00, 0x09, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x05
25
     .byte 0x3E, 0x08, 0x03, 0x05, 0x0F, 0x00, 0x09, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x05
26
     .byte 0x02, 0x84, 0x4E, 0x3D, 0x08, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x05, 0x0B, 0x03
26
     .byte 0x02, 0x84, 0x4E, 0x3D, 0x08, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x05, 0x0B, 0x03
27
-    .byte 0x0D, 0x0E, 0xC7, 0x59, 0x1D, 0x08, 0x08
27
+    .byte 0x0D, 0x0E, 0xC7, 0x59, 0x1D, 0x08, 0x08

+ 1
- 1
src/moves/power_trick/power_trick_script.s View File

15
 setword STRING_LOADER str_power_trick
15
 setword STRING_LOADER str_power_trick
16
 printstring 0x184
16
 printstring 0x184
17
 waitmessage 0x40
17
 waitmessage 0x40
18
-goto 0x081D694E
18
+goto 0x081D694E

+ 1
- 1
src/moves/roost/roost_scripts.s View File

35
 roost_end:
35
 roost_end:
36
 setbyte 0x0203FD80 0
36
 setbyte 0x0203FD80 0
37
 cmd49 0 0
37
 cmd49 0 0
38
-end
38
+end

+ 1
- 1
src/moves/uturn/u_turn_script.s View File

46
 
46
 
47
 .align 2
47
 .align 2
48
 as_uturn_particle_two:
48
 as_uturn_particle_two:
49
-.byte 0x06, 0x28, 0x3B, 0x27, 0xE0, 0xC9, 0x3A, 0x08, 0x3C, 0x69, 0x3E, 0x08, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x1C, 0x23, 0x08, 0x85, 0x14, 0x0B, 0x08
49
+.byte 0x06, 0x28, 0x3B, 0x27, 0xE0, 0xC9, 0x3A, 0x08, 0x3C, 0x69, 0x3E, 0x08, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x1C, 0x23, 0x08, 0x85, 0x14, 0x0B, 0x08

+ 1
- 1
src/overworld/dyn_npc_hooks.s View File

32
 	bx r0
32
 	bx r0
33
 
33
 
34
 bxr1:
34
 bxr1:
35
-bx r1
35
+bx r1

+ 1
- 1
src/overworld/overworld_hooks.s View File

99
     orr r0, r1
99
     orr r0, r1
100
     bl npc_get_type
100
     bl npc_get_type
101
     ldr r1, =0x08067f9d
101
     ldr r1, =0x08067f9d
102
-    bx r1
102
+    bx r1

+ 1
- 1
src/player_interaction/jump_behavior.s View File

93
 
93
 
94
 .align 2
94
 .align 2
95
 block_role_at:
95
 block_role_at:
96
-.word 0x08058F78|1
96
+.word 0x08058F78|1

+ 1
- 1
src/player_interaction/on_step.s View File

100
 	
100
 	
101
 execute_script:
101
 execute_script:
102
 	ldr r3, =0x08069AE4|1
102
 	ldr r3, =0x08069AE4|1
103
-	bx r3
103
+	bx r3

+ 1
- 1
src/test/test_scripts.s View File

14
 waitstate
14
 waitstate
15
 msgbox str_test_text 0x6
15
 msgbox str_test_text 0x6
16
 release
16
 release
17
-end
17
+end

+ 1
- 1
todo/pokemon_evolution.s View File

1202
 .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1202
 .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1203
 .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1203
 .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1204
 .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1204
 .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1205
-.byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1205
+.byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0