Browse Source

update more header files

SBird1337 6 years ago
parent
commit
dd730088c5

+ 2
- 2
makefile View File

@@ -105,12 +105,12 @@ $(STRINGDIR)/%.s: $(STRINGDIR)/%.txt
105 105
 	@echo -e "\e[93mGenerating strings $<\e[0m"
106 106
 	$(STRAGB) -o $@ -i $< -t string/table.tbl -e 0xFF
107 107
 
108
-$(BLDPATH)/%.o: %.c $(ASSETS) $(PAGB_INCLUDE)/pokeagb/pokeagb.h src/include/script_language.h	
108
+$(BLDPATH)/%.o: %.c $(ASSETS) $(PAGB_INCLUDE)/pokeagb/pokeagb.h src/include/script/language.h	
109 109
 	@echo -e "\e[32mCompiling $<\e[0m"		
110 110
 	$(shell mkdir -p $(dir $@))		
111 111
 	$(CC) $(CFLAGS) -c $< -o $@		
112 112
 		
113
-$(BLDPATH)/%.o: %.s $(PAGB_INCLUDE)/pokeagb/pokeagb.h src/include/script_language.h	
113
+$(BLDPATH)/%.o: %.s $(PAGB_INCLUDE)/pokeagb/pokeagb.h src/include/script/language.h	
114 114
 	@echo -e "\e[32mAssembling $<\e[0m"		
115 115
 	$(shell mkdir -p $(dir $@))		
116 116
 	$(PREPROC) $< $(CHARMAP) > $*.i		

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 8fcc7485f7bb44b7576a90c3cb74c80e666cc8cf
1
+Subproject commit dfea70a8db81df4268df3a91cdf0d8619c2b2afb

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

@@ -1,4 +1,4 @@
1
-/*#include <config.h>
1
+/*#include <config/core.h>
2 2
 .align 2
3 3
 .thumb
4 4
 .text

+ 1
- 1
src/battle_engine/battle_load_elements/battle_load_elements.c View File

@@ -23,7 +23,7 @@
23 23
 #include <battlescreen/battlescreen_7.h>
24 24
 #include <battlescreen/battlescreen_8.h>
25 25
 #include <battlescreen/battlescreen_9.h>
26
-#include <config.h>
26
+#include <config/core.h>
27 27
 #include <pokeagb/pokeagb.h>
28 28
 
29 29
 #define SIZEOF_ARR(a) (sizeof(a) / sizeof(a[0]))

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

@@ -1,5 +1,5 @@
1 1
 #include <battle_script.h>
2
-#include <config.h>
2
+#include <config/core.h>
3 3
 
4 4
 .text
5 5
 .align 2

+ 1
- 1
src/battle_engine/custom_structs_malloc.c View File

@@ -31,7 +31,7 @@
31 31
 /* === INCLUDE === */
32 32
 
33 33
 #include <battle_custom_structs.h>
34
-#include <config.h>
34
+#include <config/core.h>
35 35
 #include <game_engine.h>
36 36
 #include <memory.h>
37 37
 #include <constants/moves.h>

+ 1
- 1
src/encode/crc32.c View File

@@ -30,7 +30,7 @@
30 30
 
31 31
 
32 32
 /* === INCLUDE === */
33
-#include <config.h>
33
+#include <config/core.h>
34 34
 #include <types.h>
35 35
 
36 36
 /* === PROTOTYPES === */

+ 1
- 1
src/evolution/evolution_methods.c View File

@@ -31,7 +31,7 @@
31 31
 #include <pkmn_attributes.h>
32 32
 #include <agb_debug.h>
33 33
 #include <math.h>
34
-#include <config.h>
34
+#include <config/core.h>
35 35
 #include <constants/moves.h>
36 36
 #include <pokemon.h>
37 37
 #include <constants/ptypes.h>

+ 1
- 1
src/game_engine/whiteout_hook.s View File

@@ -1,4 +1,4 @@
1
-#include <config.h>
1
+#include <config/core.h>
2 2
 
3 3
 .align 2
4 4
 .thumb

+ 0
- 650
src/include/attack_names.h View File

@@ -1,650 +0,0 @@
1
-/****************************************************************************
2
- * Copyright (C) 2015-2016 by the SotS Team                                 *
3
- *                                                                          *
4
- * This file is part of Sovereign of the Skies.                             *
5
- *                                                                          *
6
- *   Sovereign of the Skies is free software: you can redistribute it       *
7
- *   and/or modify it                                                       *
8
- *   under the terms of the GNU Lesser General Public License as published  *
9
- *   by the Free Software Foundation, either version 3 of the License, or   *
10
- *   (at your option) any later version provided you include a copy of the  *
11
- *   licence and this header.                                               *
12
- *                                                                          *
13
- *   Sovereign of the Skies is distributed in the hope that it will be      *
14
- *   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of *
15
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
16
- *   GNU Lesser General Public License for more details.                    *
17
- *                                                                          *
18
- *   You should have received a copy of the GNU Lesser General Public       *
19
- *   License along with Sovereign of the Skies.                             *
20
- *   If not, see <http://www.gnu.org/licenses/>.                            *
21
- ****************************************************************************/
22
-
23
-/**
24
- * @file attack_names.h
25
- * @author Sturmvogel
26
- * @date 15 dec 2016
27
- * @brief Abilities in Assembler notation
28
- */
29
-
30
-.equ ABSORB, 0x47
31
-.equ ACID, 0x33
32
-.equ ACID_ARMOR, 0x97
33
-.equ ACID_SPRAY, 0x1EB
34
-.equ ACROBATICS, 0x200
35
-.equ ACUPRESSURE, 0x16F
36
-.equ AERIAL_ACE, 0x14C
37
-.equ AEROBLAST, 0xB1
38
-.equ AFTER_YOU, 0x1EF
39
-.equ AGILITY, 0x61
40
-.equ AIR_CUTTER, 0x13A
41
-.equ AIR_SLASH, 0x193
42
-.equ ALLY_SWITCH, 0x1F6
43
-.equ AMNESIA, 0x85
44
-.equ ANCIENT_POWER, 0xF6
45
-.equ AQUA_JET, 0x1C5
46
-.equ AQUA_RING, 0x188
47
-.equ AQUA_TAIL, 0x191
48
-.equ ARM_THRUST, 0x124
49
-.equ AROMATHERAPY, 0x138
50
-.equ AROMATIC_MIST, 0x255
51
-.equ ASSIST, 0x112
52
-.equ ASSURANCE, 0x174
53
-.equ ASTONISH, 0x136
54
-.equ ATTACK_ORDER, 0x1C6
55
-.equ ATTRACT, 0xD5
56
-.equ AURA_SPHERE, 0x18C
57
-.equ AURORA_BEAM, 0x3E
58
-.equ AUTOTOMIZE, 0x1DB
59
-.equ AVALANCHE, 0x1A3
60
-.equ BABYDOLL_EYES, 0x260
61
-.equ BARRAGE, 0x8C
62
-.equ BARRIER, 0x70
63
-.equ BATON_PASS, 0xE2
64
-.equ BEAT_UP, 0xFB
65
-.equ BELCH, 0x232
66
-.equ BELLY_DRUM, 0xBB
67
-.equ BESTOW, 0x204
68
-.equ BIDE, 0x75
69
-.equ BIND, 0x14
70
-.equ BITE, 0x2C
71
-.equ BLAST_BURN, 0x133
72
-.equ BLAZE_KICK, 0x12B
73
-.equ BLIZZARD, 0x3B
74
-.equ BLOCK, 0x14F
75
-.equ BLUE_FLARE, 0x227
76
-.equ BODY_SLAM, 0x22
77
-.equ BOLT_STRIKE, 0x226
78
-.equ BONE_CLUB, 0x7D
79
-.equ BONE_RUSH, 0xC6
80
-.equ BONEMERANG, 0x9B
81
-.equ BOOMBURST, 0x24A
82
-.equ BOUNCE, 0x154
83
-.equ BRAVE_BIRD, 0x19D
84
-.equ BRICK_BREAK, 0x118
85
-.equ BRINE, 0x16A
86
-.equ BUBBLE, 0x91
87
-.equ BUBBLE_BEAM, 0x3D
88
-.equ BUG_BITE, 0x1C2
89
-.equ BUG_BUZZ, 0x195
90
-.equ BULK_UP, 0x153
91
-.equ BULLDOZE, 0x20B
92
-.equ BULLET_PUNCH, 0x1A2
93
-.equ BULLET_SEED, 0x14B
94
-.equ CALM_MIND, 0x15B
95
-.equ CAMOUFLAGE, 0x125
96
-.equ CAPTIVATE, 0x1BD
97
-.equ CELEBRATE, 0x25E
98
-.equ CHARGE, 0x10C
99
-.equ CHARGE_BEAM, 0x1C3
100
-.equ CHARM, 0xCC
101
-.equ CHATTER, 0x1C0
102
-.equ CHIP_AWAY, 0x1F2
103
-.equ CIRCLE_THROW, 0x1FD
104
-.equ CLAMP, 0x80
105
-.equ CLEAR_SMOG, 0x1F3
106
-.equ CLOSE_COMBAT, 0x172
107
-.equ COIL, 0x1E9
108
-.equ COMET_PUNCH, 0x4
109
-.equ CONFIDE, 0x24E
110
-.equ CONFUSE_RAY, 0x6D
111
-.equ CONFUSION, 0x5D
112
-.equ CONSTRICT, 0x84
113
-.equ CONVERSION, 0xA0
114
-.equ CONVERSION_2, 0xB0
115
-.equ COPYCAT, 0x17F
116
-.equ COSMIC_POWER, 0x142
117
-.equ COTTON_GUARD, 0x21A
118
-.equ COTTON_SPORE, 0xB2
119
-.equ COUNTER, 0x44
120
-.equ COVET, 0x157
121
-.equ CRABHAMMER, 0x98
122
-.equ CRAFTY_SHIELD, 0x242
123
-.equ CROSS_CHOP, 0xEE
124
-.equ CROSS_POISON, 0x1B8
125
-.equ CRUNCH, 0xF2
126
-.equ CRUSH_CLAW, 0x132
127
-.equ CRUSH_GRIP, 0x1CE
128
-.equ CURSE, 0xAE
129
-.equ CUT, 0xF
130
-.equ DARK_PULSE, 0x18F
131
-.equ DARK_VOID, 0x1D0
132
-.equ DAZZLING_GLEAM, 0x25D
133
-.equ DEFEND_ORDER, 0x1C7
134
-.equ DEFENSE_CURL, 0x6F
135
-.equ DEFOG, 0x1B0
136
-.equ DESTINY_BOND, 0xC2
137
-.equ DETECT, 0xC5
138
-.equ DIAMOND_STORM, 0x24F
139
-.equ DIG, 0x5B
140
-.equ DISABLE, 0x32
141
-.equ DISARMING_VOICE, 0x23E
142
-.equ DISCHARGE, 0x1B3
143
-.equ DIVE, 0x123
144
-.equ DIZZY_PUNCH, 0x92
145
-.equ DOOM_DESIRE, 0x161
146
-.equ DOUBLEEDGE, 0x26
147
-.equ DOUBLE_HIT, 0x1CA
148
-.equ DOUBLE_KICK, 0x18
149
-.equ DOUBLE_SLAP, 0x3
150
-.equ DOUBLE_TEAM, 0x68
151
-.equ DRACO_METEOR, 0x1B2
152
-.equ DRAGON_ASCENT, 0x26C
153
-.equ DRAGON_BREATH, 0xE1
154
-.equ DRAGON_CLAW, 0x151
155
-.equ DRAGON_DANCE, 0x15D
156
-.equ DRAGON_PULSE, 0x196
157
-.equ DRAGON_RAGE, 0x52
158
-.equ DRAGON_RUSH, 0x197
159
-.equ DRAGON_TAIL, 0x20D
160
-.equ DRAINING_KISS, 0x241
161
-.equ DRAIN_PUNCH, 0x199
162
-.equ DREAM_EATER, 0x8A
163
-.equ DRILL_PECK, 0x41
164
-.equ DRILL_RUN, 0x211
165
-.equ DUAL_CHOP, 0x212
166
-.equ DYNAMIC_PUNCH, 0xDF
167
-.equ EARTH_POWER, 0x19E
168
-.equ EARTHQUAKE, 0x59
169
-.equ ECHOED_VOICE, 0x1F1
170
-.equ EERIE_IMPULSE, 0x256
171
-.equ EGG_BOMB, 0x79
172
-.equ ELECTRIC_TERRAIN, 0x25C
173
-.equ ELECTRIFY, 0x246
174
-.equ ELECTRO_BALL, 0x1E6
175
-.equ ELECTROWEB, 0x20F
176
-.equ EMBARGO, 0x175
177
-.equ EMBER, 0x34
178
-.equ ENCORE, 0xE3
179
-.equ ENDEAVOR, 0x11B
180
-.equ ENDURE, 0xCB
181
-.equ ENERGY_BALL, 0x19C
182
-.equ ENTRAINMENT, 0x1EE
183
-.equ ERUPTION, 0x11C
184
-.equ EXPLOSION, 0x99
185
-.equ EXTRASENSORY, 0x146
186
-.equ EXTREME_SPEED, 0xF5
187
-.equ FACADE, 0x107
188
-.equ FEINT_ATTACK, 0xB9
189
-.equ FAIRY_LOCK, 0x24B
190
-.equ FAIRY_WIND, 0x248
191
-.equ FAKE_OUT, 0xFC
192
-.equ FAKE_TEARS, 0x139
193
-.equ FALSE_SWIPE, 0xCE
194
-.equ FEATHER_DANCE, 0x129
195
-.equ FEINT, 0x16C
196
-.equ FELL_STINGER, 0x235
197
-.equ FIERY_DANCE, 0x228
198
-.equ FINAL_GAMBIT, 0x203
199
-.equ FIRE_BLAST, 0x7E
200
-.equ FIRE_FANG, 0x1A8
201
-.equ FIRE_PLEDGE, 0x207
202
-.equ FIRE_PUNCH, 0x7
203
-.equ FIRE_SPIN, 0x53
204
-.equ FISSURE, 0x5A
205
-.equ FLAIL, 0xAF
206
-.equ FLAME_BURST, 0x1E1
207
-.equ FLAME_CHARGE, 0x1E8
208
-.equ FLAME_WHEEL, 0xAC
209
-.equ FLAMETHROWER, 0x35
210
-.equ FLARE_BLITZ, 0x18A
211
-.equ FLASH, 0x94
212
-.equ FLASH_CANNON, 0x1AE
213
-.equ FLATTER, 0x104
214
-.equ FLING, 0x176
215
-.equ FLOWER_SHIELD, 0x243
216
-.equ FLY, 0x13
217
-.equ FLYING_PRESS, 0x230
218
-.equ FOCUS_BLAST, 0x19B
219
-.equ FOCUS_ENERGY, 0x74
220
-.equ FOCUS_PUNCH, 0x108
221
-.equ FOLLOW_ME, 0x10A
222
-.equ FORCE_PALM, 0x18B
223
-.equ FORESIGHT, 0xC1
224
-.equ FORESTS_CURSE, 0x23B
225
-.equ FOUL_PLAY, 0x1EC
226
-.equ FREEZEDRY, 0x23D
227
-.equ FREEZE_SHOCK, 0x229
228
-.equ FRENZY_PLANT, 0x152
229
-.equ FROST_BREATH, 0x20C
230
-.equ FRUSTRATION, 0xDA
231
-.equ FURY_ATTACK, 0x1F
232
-.equ FURY_CUTTER, 0xD2
233
-.equ FURY_SWIPES, 0x9A
234
-.equ FUSION_BOLT, 0x22F
235
-.equ FUSION_FLARE, 0x22E
236
-.equ FUTURE_SIGHT, 0xF8
237
-.equ GASTRO_ACID, 0x17C
238
-.equ GEAR_GRIND, 0x220
239
-.equ GEOMANCY, 0x259
240
-.equ GIGA_DRAIN, 0xCA
241
-.equ GIGA_IMPACT, 0x1A0
242
-.equ GLACIATE, 0x225
243
-.equ GLARE, 0x89
244
-.equ GRASS_KNOT, 0x1BF
245
-.equ GRASS_PLEDGE, 0x208
246
-.equ GRASS_WHISTLE, 0x140
247
-.equ GRASSY_TERRAIN, 0x244
248
-.equ GRAVITY, 0x164
249
-.equ GROWL, 0x2D
250
-.equ GROWTH, 0x4A
251
-.equ GRUDGE, 0x120
252
-.equ GUARD_SPLIT, 0x1D6
253
-.equ GUARD_SWAP, 0x181
254
-.equ GUILLOTINE, 0xC
255
-.equ GUNK_SHOT, 0x1B9
256
-.equ GUST, 0x10
257
-.equ GYRO_BALL, 0x168
258
-.equ HAIL, 0x102
259
-.equ HAMMER_ARM, 0x167
260
-.equ HAPPY_HOUR, 0x25B
261
-.equ HARDEN, 0x6A
262
-.equ HAZE, 0x72
263
-.equ HEAD_CHARGE, 0x21F
264
-.equ HEAD_SMASH, 0x1C9
265
-.equ HEADBUTT, 0x1D
266
-.equ HEAL_BELL, 0xD7
267
-.equ HEAL_BLOCK, 0x179
268
-.equ HEAL_ORDER, 0x1C8
269
-.equ HEAL_PULSE, 0x1F9
270
-.equ HEALING_WISH, 0x169
271
-.equ HEART_STAMP, 0x213
272
-.equ HEART_SWAP, 0x187
273
-.equ HEAT_CRASH, 0x217
274
-.equ HEAT_WAVE, 0x101
275
-.equ HEAVY_SLAM, 0x1E4
276
-.equ HELPING_HAND, 0x10E
277
-.equ HEX, 0x1FA
278
-.equ HIDDEN_POWER, 0xED
279
-.equ HIGH_JUMP_KICK, 0x88
280
-.equ HOLD_BACK, 0x262
281
-.equ HOLD_HANDS, 0x267
282
-.equ HONE_CLAWS, 0x1D4
283
-.equ HORN_ATTACK, 0x1E
284
-.equ HORN_DRILL, 0x20
285
-.equ HORN_LEECH, 0x214
286
-.equ HOWL, 0x150
287
-.equ HURRICANE, 0x21E
288
-.equ HYDRO_CANNON, 0x134
289
-.equ HYDRO_PUMP, 0x38
290
-.equ HYPER_BEAM, 0x3F
291
-.equ HYPER_FANG, 0x9E
292
-.equ HYPERSPACE_FURY, 0x26D
293
-.equ HYPERSPACE_HOLE, 0x251
294
-.equ HYPER_VOICE, 0x130
295
-.equ HYPNOSIS, 0x5F
296
-.equ ICE_BALL, 0x12D
297
-.equ ICE_BEAM, 0x3A
298
-.equ ICE_BURN, 0x22A
299
-.equ ICE_FANG, 0x1A7
300
-.equ ICE_PUNCH, 0x8
301
-.equ ICE_SHARD, 0x1A4
302
-.equ ICICLE_CRASH, 0x22C
303
-.equ ICICLE_SPEAR, 0x14D
304
-.equ ICY_WIND, 0xC4
305
-.equ IMPRISON, 0x11E
306
-.equ INCINERATE, 0x1FE
307
-.equ INFERNO, 0x205
308
-.equ INFESTATION, 0x263
309
-.equ INGRAIN, 0x113
310
-.equ ION_DELUGE, 0x239
311
-.equ IRON_DEFENSE, 0x14E
312
-.equ IRON_HEAD, 0x1BA
313
-.equ IRON_TAIL, 0xE7
314
-.equ JUDGMENT, 0x1C1
315
-.equ JUMP_KICK, 0x1A
316
-.equ KARATE_CHOP, 0x2
317
-.equ KINESIS, 0x86
318
-.equ KINGS_SHIELD, 0x24C
319
-.equ KNOCK_OFF, 0x11A
320
-.equ LANDS_WRATH, 0x268
321
-.equ LAST_RESORT, 0x183
322
-.equ LAVA_PLUME, 0x1B4
323
-.equ LEAF_BLADE, 0x15C
324
-.equ LEAF_STORM, 0x1B5
325
-.equ LEAF_TORNADO, 0x218
326
-.equ LEECH_LIFE, 0x8D
327
-.equ LEECH_SEED, 0x49
328
-.equ LEER, 0x2B
329
-.equ LICK, 0x7A
330
-.equ LIGHT_OF_RUIN, 0x269
331
-.equ LIGHT_SCREEN, 0x71
332
-.equ LOCKON, 0xC7
333
-.equ LOVELY_KISS, 0x8E
334
-.equ LOW_KICK, 0x43
335
-.equ LOW_SWEEP, 0x1EA
336
-.equ LUCKY_CHANT, 0x17D
337
-.equ LUNAR_DANCE, 0x1CD
338
-.equ LUSTER_PURGE, 0x127
339
-.equ MACH_PUNCH, 0xB7
340
-.equ MAGIC_COAT, 0x115
341
-.equ MAGIC_ROOM, 0x1DE
342
-.equ MAGICAL_LEAF, 0x159
343
-.equ MAGMA_STORM, 0x1CF
344
-.equ MAGNET_BOMB, 0x1BB
345
-.equ MAGNETIC_FLUX, 0x25A
346
-.equ MAGNET_RISE, 0x189
347
-.equ MAGNITUDE, 0xDE
348
-.equ MAT_BLOCK, 0x231
349
-.equ ME_FIRST, 0x17E
350
-.equ MEAN_LOOK, 0xD4
351
-.equ MEDITATE, 0x60
352
-.equ MEGA_DRAIN, 0x48
353
-.equ MEGA_KICK, 0x19
354
-.equ MEGA_PUNCH, 0x5
355
-.equ MEGAHORN, 0xE0
356
-.equ MEMENTO, 0x106
357
-.equ METAL_BURST, 0x170
358
-.equ METAL_CLAW, 0xE8
359
-.equ METAL_SOUND, 0x13F
360
-.equ METEOR_MASH, 0x135
361
-.equ METRONOME, 0x76
362
-.equ MILK_DRINK, 0xD0
363
-.equ MIMIC, 0x66
364
-.equ MIND_READER, 0xAA
365
-.equ MINIMIZE, 0x6B
366
-.equ MIRACLE_EYE, 0x165
367
-.equ MIRROR_COAT, 0xF3
368
-.equ MIRROR_MOVE, 0x77
369
-.equ MIRROR_SHOT, 0x1AD
370
-.equ MIST, 0x36
371
-.equ MIST_BALL, 0x128
372
-.equ MISTY_TERRAIN, 0x245
373
-.equ MOONBLAST, 0x249
374
-.equ MOONLIGHT, 0xEC
375
-.equ MORNING_SUN, 0xEA
376
-.equ MUD_SLAP, 0xBD
377
-.equ MUD_BOMB, 0x1AA
378
-.equ MUD_SHOT, 0x155
379
-.equ MUD_SPORT, 0x12C
380
-.equ MUDDY_WATER, 0x14A
381
-.equ MYSTICAL_FIRE, 0x253
382
-.equ NASTY_PLOT, 0x1A1
383
-.equ NATURAL_GIFT, 0x16B
384
-.equ NATURE_POWER, 0x10B
385
-.equ NEEDLE_ARM, 0x12E
386
-.equ NIGHT_DAZE, 0x21B
387
-.equ NIGHT_SHADE, 0x65
388
-.equ NIGHT_SLASH, 0x190
389
-.equ NIGHTMARE, 0xAB
390
-.equ NOBLE_ROAR, 0x238
391
-.equ NUZZLE, 0x261
392
-.equ OBLIVION_WING, 0x265
393
-.equ OCTAZOOKA, 0xBE
394
-.equ ODOR_SLEUTH, 0x13C
395
-.equ OMINOUS_WIND, 0x1D2
396
-.equ ORIGIN_PULSE, 0x26A
397
-.equ OUTRAGE, 0xC8
398
-.equ OVERHEAT, 0x13B
399
-.equ PAIN_SPLIT, 0xDC
400
-.equ PARABOLIC_CHARGE, 0x23A
401
-.equ PARTING_SHOT, 0x23F
402
-.equ PAY_DAY, 0x6
403
-.equ PAYBACK, 0x173
404
-.equ PECK, 0x40
405
-.equ PERISH_SONG, 0xC3
406
-.equ PETAL_BLIZZARD, 0x23C
407
-.equ PETAL_DANCE, 0x50
408
-.equ PHANTOM_FORCE, 0x236
409
-.equ PIN_MISSILE, 0x2A
410
-.equ PLAY_NICE, 0x24D
411
-.equ PLAY_ROUGH, 0x247
412
-.equ PLUCK, 0x16D
413
-.equ POISON_FANG, 0x131
414
-.equ POISON_GAS, 0x8B
415
-.equ POISON_JAB, 0x18E
416
-.equ POISON_POWDER, 0x4D
417
-.equ POISON_STING, 0x28
418
-.equ POISON_TAIL, 0x156
419
-.equ POUND, 0x1
420
-.equ POWDER, 0x258
421
-.equ POWDER_SNOW, 0xB5
422
-.equ POWER_GEM, 0x198
423
-.equ POWER_SPLIT, 0x1D7
424
-.equ POWER_SWAP, 0x180
425
-.equ POWER_TRICK, 0x17B
426
-.equ POWERUP_PUNCH, 0x264
427
-.equ POWER_WHIP, 0x1B6
428
-.equ PRECIPICE_BLADES, 0x26B
429
-.equ PRESENT, 0xD9
430
-.equ PROTECT, 0xB6
431
-.equ PSYBEAM, 0x3C
432
-.equ PSYCH_UP, 0xF4
433
-.equ PSYCHIC, 0x5E
434
-.equ PSYCHO_BOOST, 0x162
435
-.equ PSYCHO_CUT, 0x1AB
436
-.equ PSYCHO_SHIFT, 0x177
437
-.equ PSYSHOCK, 0x1D9
438
-.equ PSYSTRIKE, 0x21C
439
-.equ PSYWAVE, 0x95
440
-.equ PUNISHMENT, 0x182
441
-.equ PURSUIT, 0xE4
442
-.equ QUASH, 0x1FF
443
-.equ QUICK_ATTACK, 0x62
444
-.equ QUICK_GUARD, 0x1F5
445
-.equ QUIVER_DANCE, 0x1E3
446
-.equ RAGE, 0x63
447
-.equ RAGE_POWDER, 0x1DC
448
-.equ RAIN_DANCE, 0xF0
449
-.equ RAPID_SPIN, 0xE5
450
-.equ RAZOR_LEAF, 0x4B
451
-.equ RAZOR_SHELL, 0x216
452
-.equ RAZOR_WIND, 0xD
453
-.equ RECOVER, 0x69
454
-.equ RECYCLE, 0x116
455
-.equ REFLECT, 0x73
456
-.equ REFLECT_TYPE, 0x201
457
-.equ REFRESH, 0x11F
458
-.equ RELIC_SONG, 0x223
459
-.equ REST, 0x9C
460
-.equ RETALIATE, 0x202
461
-.equ RETURN, 0xD8
462
-.equ REVENGE, 0x117
463
-.equ REVERSAL, 0xB3
464
-.equ ROAR, 0x2E
465
-.equ ROAR_OF_TIME, 0x1CB
466
-.equ ROCK_BLAST, 0x15E
467
-.equ ROCK_CLIMB, 0x1AF
468
-.equ ROCK_POLISH, 0x18D
469
-.equ ROCK_SLIDE, 0x9D
470
-.equ ROCK_SMASH, 0xF9
471
-.equ ROCK_THROW, 0x58
472
-.equ ROCK_TOMB, 0x13D
473
-.equ ROCK_WRECKER, 0x1B7
474
-.equ ROLE_PLAY, 0x110
475
-.equ ROLLING_KICK, 0x1B
476
-.equ ROLLOUT, 0xCD
477
-.equ ROOST, 0x163
478
-.equ ROTOTILLER, 0x233
479
-.equ ROUND, 0x1F0
480
-.equ SACRED_FIRE, 0xDD
481
-.equ SACRED_SWORD, 0x215
482
-.equ SAFEGUARD, 0xDB
483
-.equ SAND_ATTACK, 0x1C
484
-.equ SAND_TOMB, 0x148
485
-.equ SANDSTORM, 0xC9
486
-.equ SCALD, 0x1F7
487
-.equ SCARY_FACE, 0xB8
488
-.equ SCRATCH, 0xA
489
-.equ SCREECH, 0x67
490
-.equ SEARING_SHOT, 0x221
491
-.equ SECRET_POWER, 0x122
492
-.equ SECRET_SWORD, 0x224
493
-.equ SEED_BOMB, 0x192
494
-.equ SEED_FLARE, 0x1D1
495
-.equ SEISMIC_TOSS, 0x45
496
-.equ SELFDESTRUCT, 0x78
497
-.equ SHADOW_BALL, 0xF7
498
-.equ SHADOW_CLAW, 0x1A5
499
-.equ SHADOW_FORCE, 0x1D3
500
-.equ SHADOW_PUNCH, 0x145
501
-.equ SHADOW_SNEAK, 0x1A9
502
-.equ SHARPEN, 0x9F
503
-.equ SHEER_COLD, 0x149
504
-.equ SHELL_SMASH, 0x1F8
505
-.equ SHIFT_GEAR, 0x1FC
506
-.equ SHOCK_WAVE, 0x15F
507
-.equ SIGNAL_BEAM, 0x144
508
-.equ SILVER_WIND, 0x13E
509
-.equ SIMPLE_BEAM, 0x1ED
510
-.equ SING, 0x2F
511
-.equ SKETCH, 0xA6
512
-.equ SKILL_SWAP, 0x11D
513
-.equ SKULL_BASH, 0x82
514
-.equ SKY_ATTACK, 0x8F
515
-.equ SKY_DROP, 0x1FB
516
-.equ SKY_UPPERCUT, 0x147
517
-.equ SLACK_OFF, 0x12F
518
-.equ SLAM, 0x15
519
-.equ SLASH, 0xA3
520
-.equ SLEEP_POWDER, 0x4F
521
-.equ SLEEP_TALK, 0xD6
522
-.equ SLUDGE, 0x7C
523
-.equ SLUDGE_BOMB, 0xBC
524
-.equ SLUDGE_WAVE, 0x1E2
525
-.equ SMACK_DOWN, 0x1DF
526
-.equ SMELLING_SALTS, 0x109
527
-.equ SMOG, 0x7B
528
-.equ SMOKESCREEN, 0x6C
529
-.equ SNARL, 0x22B
530
-.equ SNATCH, 0x121
531
-.equ SNORE, 0xAD
532
-.equ SPIKY_SHIELD, 0x254
533
-.equ SOAK, 0x1E7
534
-.equ SOFTBOILED, 0x87
535
-.equ SOLAR_BEAM, 0x4C
536
-.equ SONIC_BOOM, 0x31
537
-.equ SPACIAL_REND, 0x1CC
538
-.equ SPARK, 0xD1
539
-.equ SPIDER_WEB, 0xA9
540
-.equ SPIKE_CANNON, 0x83
541
-.equ SPIKES, 0xBF
542
-.equ SPIT_UP, 0xFF
543
-.equ SPITE, 0xB4
544
-.equ SPLASH, 0x96
545
-.equ SPORE, 0x93
546
-.equ STEALTH_ROCK, 0x1BE
547
-.equ STEAM_ERUPTION, 0x250
548
-.equ STEEL_WING, 0xD3
549
-.equ STICKY_WEB, 0x234
550
-.equ STOCKPILE, 0xFE
551
-.equ STOMP, 0x17
552
-.equ STONE_EDGE, 0x1BC
553
-.equ STORED_POWER, 0x1F4
554
-.equ STORM_THROW, 0x1E0
555
-.equ STEAMROLLER, 0x219
556
-.equ STRENGTH, 0x46
557
-.equ STRING_SHOT, 0x51
558
-.equ STRUGGLE, 0xA5
559
-.equ STRUGGLE_BUG, 0x20A
560
-.equ STUN_SPORE, 0x4E
561
-.equ SUBMISSION, 0x42
562
-.equ SUBSTITUTE, 0xA4
563
-.equ SUCKER_PUNCH, 0x185
564
-.equ SUNNY_DAY, 0xF1
565
-.equ SUPER_FANG, 0xA2
566
-.equ SUPERPOWER, 0x114
567
-.equ SUPERSONIC, 0x30
568
-.equ SURF, 0x39
569
-.equ SWAGGER, 0xCF
570
-.equ SWALLOW, 0x100
571
-.equ SWEET_KISS, 0xBA
572
-.equ SWEET_SCENT, 0xE6
573
-.equ SWIFT, 0x81
574
-.equ SWITCHEROO, 0x19F
575
-.equ SWORDS_DANCE, 0xE
576
-.equ SYNCHRONOISE, 0x1E5
577
-.equ SYNTHESIS, 0xEB
578
-.equ TACKLE, 0x21
579
-.equ TAIL_GLOW, 0x126
580
-.equ TAIL_SLAP, 0x21D
581
-.equ TAIL_WHIP, 0x27
582
-.equ TAILWIND, 0x16E
583
-.equ TAKE_DOWN, 0x24
584
-.equ TAUNT, 0x10D
585
-.equ TECHNO_BLAST, 0x222
586
-.equ TEETER_DANCE, 0x12A
587
-.equ TELEKINESIS, 0x1DD
588
-.equ TELEPORT, 0x64
589
-.equ THIEF, 0xA8
590
-.equ THOUSAND_ARROWS, 0x266
591
-.equ THOUSAND_WAVES, 0x267
592
-.equ THRASH, 0x25
593
-.equ THUNDER, 0x57
594
-.equ THUNDER_FANG, 0x1A6
595
-.equ THUNDER_PUNCH, 0x9
596
-.equ THUNDER_SHOCK, 0x54
597
-.equ THUNDER_WAVE, 0x56
598
-.equ THUNDERBOLT, 0x55
599
-.equ TICKLE, 0x141
600
-.equ TOPSYTURVY, 0x240
601
-.equ TORMENT, 0x103
602
-.equ TOXIC, 0x5C
603
-.equ TOXIC_SPIKES, 0x186
604
-.equ TRANSFORM, 0x90
605
-.equ TRI_ATTACK, 0xA1
606
-.equ TRICK, 0x10F
607
-.equ TRICKORTREAT, 0x237
608
-.equ TRICK_ROOM, 0x1B1
609
-.equ TRIPLE_KICK, 0xA7
610
-.equ TRUMP_CARD, 0x178
611
-.equ TWINEEDLE, 0x29
612
-.equ TWISTER, 0xEF
613
-.equ UTURN, 0x171
614
-.equ UPROAR, 0xFD
615
-.equ VCREATE, 0x22D
616
-.equ VACUUM_WAVE, 0x19A
617
-.equ VENOM_DRENCH, 0x257
618
-.equ VENOSHOCK, 0x1DA
619
-.equ VICE_GRIP, 0xB
620
-.equ VINE_WHIP, 0x16
621
-.equ VITAL_THROW, 0xE9
622
-.equ VOLT_SWITCH, 0x209
623
-.equ VOLT_TACKLE, 0x158
624
-.equ WAKEUP_SLAP, 0x166
625
-.equ WATER_GUN, 0x37
626
-.equ WATER_PLEDGE, 0x206
627
-.equ WATER_PULSE, 0x160
628
-.equ WATER_SPORT, 0x15A
629
-.equ WATER_SPOUT, 0x143
630
-.equ WATERFALL, 0x7F
631
-.equ WATER_SHURIKEN, 0x252
632
-.equ WEATHER_BALL, 0x137
633
-.equ WHIRLPOOL, 0xFA
634
-.equ WHIRLWIND, 0x12
635
-.equ WIDE_GUARD, 0x1D5
636
-.equ WILD_CHARGE, 0x210
637
-.equ WILLOWISP, 0x105
638
-.equ WING_ATTACK, 0x11
639
-.equ WISH, 0x111
640
-.equ WITHDRAW, 0x6E
641
-.equ WONDER_ROOM, 0x1D8
642
-.equ WOOD_HAMMER, 0x1C4
643
-.equ WORK_UP, 0x20E
644
-.equ WORRY_SEED, 0x184
645
-.equ WRAP, 0x23
646
-.equ WRING_OUT, 0x17A
647
-.equ XSCISSOR, 0x194
648
-.equ YAWN, 0x119
649
-.equ ZAP_CANNON, 0xC0
650
-.equ ZEN_HEADBUTT, 0x1AC

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

@@ -28,7 +28,7 @@
28 28
  */
29 29
 
30 30
 
31
-#include <attack_names.h>
31
+#include <constants/moves.h>
32 32
 
33 33
 @@ Banks
34 34
 #define BANK_USER	1

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

@@ -6,7 +6,7 @@
6 6
 #include "fade.h"
7 7
 #include "lcd.h"
8 8
 #include <callback.h>
9
-#include <config.h>
9
+#include <config/core.h>
10 10
 #include <pkmn_attributes.h>
11 11
 #include <battle_structs.h>
12 12
 

src/include/config.h → src/include/config/core.h View File


src/include/battlescreen.h → src/include/script/battlescreen.h View File


src/include/script_language.h → src/include/script/language.h View File

@@ -1,11 +1,12 @@
1 1
 #ifndef SCRIPT_LANG_H_
2 2
 #define SCRIPT_LANG_H_
3 3
 
4
-#include <config.h>
5
-#include <applymovements.h>
6
-#include <mugssprites.h>
7
-#include <battlescreen.h>
8
-#include <script_constant.h>
4
+#include <config/core.h>
5
+#include <script/movement.h>
6
+#include <script/mugshot.h>
7
+#include <script/battlescreen.h>
8
+
9
+#include <script_constant.h> /*TODO: REMOVE ONCE THIS IS DEALT WITH*/
9 10
 
10 11
 @@ Costum Specials
11 12
 .equ SP_BATCHMAPTILE, 0x7

src/include/applymovements.h → src/include/script/movement.h View File


src/include/mugssprites.h → src/include/script/mugshot.h View File

@@ -1,5 +1,5 @@
1 1
 #ifndef MUG_IDS_H_
2
-#define  MUG_IDS_H_
2
+#define MUG_IDS_H_
3 3
 
4 4
 #define MUG_NOAH 1
5 5
 #define MUG_EMMA 9

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

@@ -1,4 +1,4 @@
1
-#include <config.h>
1
+#include <config/core.h>
2 2
 
3 3
 .EQU BLDMOD,0x50
4 4
 .EQU LCD_WIN_IN,0x48

+ 1
- 1
src/interface/textbox_mugshots.c View File

@@ -31,7 +31,7 @@
31 31
 /* === INCLUDES === */
32 32
 #include <objects.h>
33 33
 #include <callback.h>
34
-#include <config.h>
34
+#include <config/core.h>
35 35
 #include <lcd.h>
36 36
 #include <debug.h>
37 37
 #include <game_engine.h>

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

@@ -7,9 +7,9 @@
7 7
 script_fang_flinch:
8 8
 
9 9
 setbyte 0x2023E85 0x8
10
-jumpifhalfword 0x0 0x2023D4A FIRE_FANG firefang
11
-jumpifhalfword 0x0 0x2023D4A ICE_FANG icefang
12
-jumpifhalfword 0x0 0x2023D4A THUNDER_FANG thunderfang
10
+jumpifhalfword 0x0 0x2023D4A MOVE_FIRE_FANG firefang
11
+jumpifhalfword 0x0 0x2023D4A MOVE_ICE_FANG icefang
12
+jumpifhalfword 0x0 0x2023D4A MOVE_THUNDER_FANG thunderfang
13 13
 goto 0x81D6900
14 14
 
15 15
 firefang:

+ 1
- 1
src/music/battle_music_lookup.c View File

@@ -6,7 +6,7 @@
6 6
 #include <pokemon.h>
7 7
 #include <agb_debug.h>
8 8
 #include <sound.h>
9
-#include <config.h>
9
+#include <config/core.h>
10 10
 
11 11
 #define SONG_ID_SKIP_PLAY 0xFFFF
12 12
 

+ 1
- 1
src/overworld/tileset_animation/text_animator.c View File

@@ -1,7 +1,7 @@
1 1
 #include <pokeagb/pokeagb.h>
2 2
 #include <agb_debug.h>
3 3
 #include <tileset_animation/font.h>
4
-#include <config.h>
4
+#include <config/core.h>
5 5
 #include <assert.h>
6 6
 
7 7
 #define CANVAS_X_START (22)

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

@@ -1,4 +1,4 @@
1
-#include <config.h>
1
+#include <config/core.h>
2 2
 
3 3
 .text
4 4
 .align 2

+ 1
- 1
src/specials/camera_move.c View File

@@ -35,7 +35,7 @@
35 35
 #include "camera_move.h"
36 36
 #include <callback.h>
37 37
 #include <fade.h>
38
-#include <config.h>
38
+#include <config/core.h>
39 39
 #include <lcd.h>
40 40
 
41 41
 /* === PROTOTYPES === */

+ 1
- 1
src/specials/custom_specials.c View File

@@ -32,7 +32,7 @@
32 32
 
33 33
 #include "camera_move.h"
34 34
 #include "cutscene_meteor.h"
35
-#include <config.h>
35
+#include <config/core.h>
36 36
 #include <pokeagb/pokeagb.h>
37 37
 
38 38
 /* === TYPES === */

+ 1
- 1
src/specials/load_text_special.c View File

@@ -33,7 +33,7 @@
33 33
 /* === INCLUDE === */
34 34
 #include <types.h>
35 35
 #include <game_engine.h>
36
-#include <config.h>
36
+#include <config/core.h>
37 37
 #include <save_one.h>
38 38
 
39 39
 /* === PROTOTYPES === */

+ 1
- 1
src/specials/trainer_battle.c View File

@@ -32,7 +32,7 @@
32 32
 
33 33
 #include <agb_debug.h>
34 34
 #include <callback.h>
35
-#include <config.h>
35
+#include <config/core.h>
36 36
 #include <debug.h>
37 37
 #include <game_engine.h>
38 38
 #include <types.h>

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

@@ -1,4 +1,4 @@
1
-#include <script_language.h>
1
+#include <script/language.h>
2 2
 
3 3
 .align 2
4 4
 .thumb