Use a static ordering for text archives + refactor terminology + unif…

…y includes
pret · Jan 28, 2025 · ab09fd6 · ab09fd6
1 parent 9424c14
commit ab09fd6
Show file tree

Hide file tree

Showing 1,176 changed files with 2,127 additions and 2,749 deletions.
diff --git a/asm/macros/btlcmd.inc b/asm/macros/btlcmd.inc
@@ -12,8 +12,8 @@
 #include "generated/moves.h"
 #include "generated/pokemon_types.h"
 #include "generated/species_data_params.h"
-#include "gmm/message_bank_battle_strings.h"
 #include "battle/btlcmd.h"
+#include "res/text/bank/battle_strings.h"
 
     .equ FALSE, 0
     .equ TRUE, 1

diff --git a/generated/meson.build b/generated/meson.build
@@ -66,6 +66,7 @@ metang_generators = {
     'shadow_sizes': { 'type': 'enum', 'tag': 'ShadowSize' },
     'species': { 'type': 'enum', 'tag': 'Species' },
     'species_data_params': { 'type': 'enum', 'tag': 'SpeciesDataParam' },
+    'text_banks': { 'type': 'enum', 'tag': 'TextBank' },
     'trainer_score_events': { 'type': 'enum', 'tag': 'TrainerScoreEvent' },
 }
 
@@ -104,3 +105,4 @@ foreach gen_key : metang_generators.keys()
 endforeach
 
 species_txt = files('species.txt')
+text_banks_txt = files('text_banks.txt')