Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor builds from res/pokemon/*/data.json #348

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ IncludeBlocks: Regroup
IncludeCategories:
- Regex: '((<.+>)|("nitro/.*\.h"))'
Priority: 1
- Regex: '"(consts|constants)/.*\.h"'
- Regex: '"(consts|constants|generated)/.*\.h"'
Priority: 2
- Regex: '"(struct_(decls|defs))/.*\.h"'
Priority: 3
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
/subprojects/SDATTool/
/subprojects/knarc/
/subprojects/narc/
/subprojects/metang/
/subprojects/rapidjson-*/

# CLion folders
.idea/
Expand Down
6 changes: 4 additions & 2 deletions asm/macros/btlcmd.inc
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,18 @@
#include "constants/battle.h"
#include "constants/items.h"
#include "constants/species.h"
#include "generated/abilities.h"
#include "generated/items.h"
#include "generated/moves.h"
#include "generated/pokemon_types.h"
#include "gmm/message_bank_battle_strings.h"
#include "battle/btlcmd.h"

.include "consts/abilities.inc"
.include "consts/battle.inc"
.include "consts/battle_subscripts.inc"
.include "consts/btlcmd.inc"
.include "consts/game_records.inc"
.include "consts/gender.inc"
.include "consts/items.inc"
.include "consts/moves.inc"
.include "consts/pokemon.inc"

Expand Down
8 changes: 4 additions & 4 deletions asm/macros/scrcmd.inc
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#include "generated/items.h"
#include "generated/moves.h"
#include "generated/species.h"
#include "generated/catching_show_points_category.h"
.include "macros/movement.inc"
.include "consts/badges.inc"
.include "consts/catching_show.inc"
.include "consts/game_records.inc"
.include "consts/items.inc"
.include "consts/journal.inc"
.include "consts/map.inc"
.include "consts/moves.inc"
.include "consts/poketch.inc"
.include "consts/scrcmd.inc"
.include "consts/sdat.inc"
.include "consts/species.inc"

#include "res/trainers/trdata.naix"

Expand Down
5 changes: 3 additions & 2 deletions asm/trainer_ai/trainer_ai_script.s
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
#include "constants/battle.h"
#include "constants/items.h"
#include "constants/battle/trainer_ai.h"
#include "generated/abilities.h"
#include "generated/moves.h"
#include "generated/pokemon_types.h"

.include "consts/abilities.inc"
.include "consts/battle.inc"
.include "consts/gender.inc"
.include "consts/items.inc"
.include "consts/moves.inc"
.include "consts/pokemon.inc"
.include "consts/trainer_ai.inc"
Expand Down
133 changes: 0 additions & 133 deletions consts/abilities.json

This file was deleted.

34 changes: 0 additions & 34 deletions consts/catching_show.json

This file was deleted.

Loading
Loading