full out map and script compile

main.asm

 .gba
 .thumb
 .open "base/bpre0.gba","build/pkmn_sots.gba",0x08000000
-
 //exclude for now
 //.include "patches/split_physical_special.asm"
 .include "patches/hooks.asm"
 
+.include "patches/maps.asm"
 
 .include "patches/dynamic_overworld_hooks.asm"
 

makefile

 VBA		:= vba
 LAN	:= de
 STRAGB	:= string2agb
+PYPROJS := @python ../tools/v_tools/pyproj2s.py
+PYMAPS	:= @python ../tools/v_tools/pymap2s.py
+PYSETS	:= @python ../tools/v_tools/pyset2s.py
 
 export PATH := $(realpath ../tools):$(PATH)
 
 
 CHARMAP := charmap.txt
 
-DEFINES   := -DBPRE -DSOFTWARE_VERSION=0
+DEFINES   := -DBPRE -DSOFTWARE_VERSION=0 -DLAN_DE
 ASFLAGS   := -mthumb
 CFLAGS    := -mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -fdiagnostics-show-option -fdiagnostics-color -mlong-calls -march=armv4t -Og -std=c11 -Wall -Wextra -Wunreachable-code -I$(PAGB_INCLUDE) -Isrc/include -Igenerated_image -fdiagnostics-color $(DEFINES)
 GRITFLAGS := -ftc -fa
 STRINGDIR := string
 MAPROOT	  := sots-private/map
 MAPMAPS	  := $(MAPROOT)/maps
-MAPTS	  := $(MAPROOT)/tilesets
+MAPTS	  := $(MAPROOT)/tileset
+MAP_PROJ	:= $(MAPROOT)/sots.json
 
 MAIN_OBJ  := $(BLDPATH)/linked.o
 B_ENGINE  := battle_engine/build/linked.o
 
 IMAGES=$(call rwildcard,$(AUTO_ASSET_ROOT),*.png)
 
+TSPNG=$(call rwildcard,$(MAPTS)/,*.png)
+TS_GEN_SRC	:= $(TSPNG:%.png=%.s)
+TS_GEN_O	:= $(TSPNG:%.png=$(BLDPATH)/%.o)
+
 GEN_SRC		:= $(IMAGES:$(AUTO_ASSET_ROOT)/%.png=generated_image/%.c)
 ASM_SRC     := $(call rwildcard,src/,*.s)
 C_SRC       := $(call rwildcard,src/,*.c)
 STRING_SRC	:= $(STRING:%.txt=%.s)
 SCRIPT_SRC	:= $(call rwildcard,$(MAPMAPS)/,*.s)
 
+MAP_PROJ_S	:= $(MAP_PROJ:%.json=%.s)
+MAP_PROJ_O	:= $(MAP_PROJ:%.json=$(BLDPATH)/%.o)
+
+MAP_FILES	:= $(call rwildcard,$(MAPMAPS)/,*.pmh)
+MAP_FILES_S	:= $(MAP_FILES:%.pmh=%.s)
+MAP_FILES_O	:= $(MAP_FILES:%.pmh=$(BLDPATH)/%.o)
+
+TS_FILES	:= $(call rwildcard,$(MAPTS)/,*.pts)
+TS_FILES_S	:= $(TS_FILES:%.pts=%.s)
+TS_FILES_O	:= $(TS_FILES:%.pts=$(BLDPATH)/%.o)
 
 GEN_OBJ		:= $(GEN_SRC:%.c=$(BLDPATH)/%.o)
 STRING_OBJ	:= $(STRING_SRC:%.s=$(BLDPATH)/%.o)
 C_OBJ       := $(C_SRC:%.c=$(BLDPATH)/%.o)
 DATA_OBJ    := $(DATA_SRC:%.s=$(BLDPATH)/%.o)
 SCRIPT_OBJ	:= $(SCRIPT_SRC:%.s=$(BLDPATH)/%.o)
-ALL_OBJ     := $(GEN_OBJ) $(C_OBJ) $(ASM_OBJ) $(DATA_OBJ) $(STRING_OBJ) $(SCRIPT_OBJ)
+ALL_OBJ     := $(GEN_OBJ) $(C_OBJ) $(ASM_OBJ) $(DATA_OBJ) $(STRING_OBJ) $(SCRIPT_OBJ) $(MAP_PROJ_O) $(MAP_FILES_O) $(TS_FILES_O) $(TS_GEN_O)
+
+$(MAPMAPS)/%.s: $(MAPMAPS)/%.pmh
+	@echo -e "\e[96mGenerating map $<\e[0m"
+	$(PYMAPS) -o $@ $<
+
+$(MAPTS)/%.s: $(MAPTS)/%.pts
+	@echo -e "\e[94mGenerating tileset $<\e[0m"
+	$(PYSETS) -o $@ $<
 
 $(STRINGDIR)/%.s: $(STRINGDIR)/%.txt
 	@echo -e "\e[93mGenerating strings $<\e[0m"
 	$(CC) $(CFLAGS) -c -x assembler-with-cpp $*.i -o $@
 	@rm -f $*.i
 
+$(MAPTS)/%.s: $(MAPTS)/%.png
+	@echo -e "\e[34mProcessing image (tileset) $<\e[0m"
+	$(GRIT) $< -o $@ -fts -gzl -pz! -pu16 -gB4 -m! -mR!
+
 generated_image/%.c: $(AUTO_ASSET_ROOT)/%.png $(AUTO_ASSET_ROOT)/%.grit
 	@echo -e "\e[34mProcessing image $<\e[0m"
 	$(shell mkdir -p $(dir $@))
 	$(LD) $(LDFLAGS) -T $(PAGB_LINK) -T linker.ld -T bpre.sym --whole-archive -r -o $@ --start-group -T $(TMP_LD) --end-group
 	@rm -f $(TMP_LD)
 
+$(MAP_PROJ_S): $(MAP_PROJ)
+	@echo -e "\e[91mGenerating map project $<\e[0m"
+	$(PYPROJS) -b sovereign_banks -f sovereign_footer -o $@ $<
+
 .PHONY: $(B_ENGINE)
 $(B_ENGINE):
 	$(MAKE) -C battle_engine build/linked.o

patches/game_engine/quick_hacks.asm

 .word 0x00000000
 
 .org 0x08054A08
-//.byte 0x7
+.byte 0x7
 
 .org 0x08054A00
-//.byte 0x13
+.byte 0x13
 
 .org 0x08054A04
-//.byte 0x5
+.byte 0x5
 
 .org 0x08054A06
-//.byte 0x0
+.byte 0x0

patches/maps.asm

+/* all map bank table symbols and map footer tables go here */
+
+.org 0x0805524C
+.word sovereign_banks
+
+.org 0x08055194
+.word sovereign_footer

sots-private

-Subproject commit 04d6d99a48f025594551fe535770abbc3b9d8075
+Subproject commit 8cc9cb9f32d2b30d2ac317a03f6e9a4ca1ebf80c

src/include/pymap_constants.h

 .equ REGENMUT, 0x55
 .equ KAELTEWAHN, 0x56
 .equ SANDHERZ, 0x57
-.equ WANDLUNGSK., 0x58
+.equ WANDLUNGSKUNST, 0x58
 .equ TOLLWUT, 0x59
 .equ ZEITSPIEL, 0x5a
 .equ STROLCH, 0x5b
-.equ ORKANSCHW., 0x5c
+.equ ORKANSCHWINGE, 0x5c
 .equ DUNKLE_MAGIE, 0x5d
 .equ LERNFAEHIG, 0x5e
 .equ HAGELALARM, 0x5f
 .equ HOCHMUT, 0x60
 .equ AP_SPARER, 0x61
-.equ TAKTIKWECHS., 0x62
+.equ TAKTIKWECHSEL, 0x62
 .equ LUZID, 0x63
 .equ UNGEBROCHEN, 0x64
 .equ LEBENSRAEUBER, 0x65
 .equ ALLROUNDER, 0x6b
 .equ HITZEWAHN, 0x6c
 .equ GIFTWAHN, 0x6d
-.equ XXX, 0x6e
-.equ XXX, 0x6f
-.equ XXX, 0x70
 
 
 
 .equ MUS_KAMPF_GEGEN_TRAINER_HOENN, 0x10a
 .equ MUS_CHANEIRA_TANZ, 0x10b
 .equ MUS_SOUND_GLUCKWUNSCH, 0x10c
-.equ MUS_SOUND_GLUCKWUNSCH, 0x10d
+.equ MUS_SOUND_GLUCKWUNSCH_TWO, 0x10d
 .equ MUS_VERRUCKTER_SOUND, 0x10e
-.equ MUS_VERRUCKTER_SOUND, 0x10f
+.equ MUS_VERRUCKTER_SOUND_TWO, 0x10f
 .equ MUS_KOMMT_MIT_SPIELER_WIRD_HERUMGEFUHRT, 0x110
 .equ MUS_SPIELHALLE, 0x111
 .equ MUS_ROCKET_HQ_AND_AZURIA_HOHLE_AND_TOP_4_BRUNO, 0x112
 .equ BEHAVIOUR_UMHERBLICKEN, 0x1
 .equ BEHAVIOUR_HERUMGEHEN, 0x2
 .equ BEHAVIOUR_GEHE_AUF_UND_AB, 0x3
-.equ BEHAVIOUR_GEHE_AUF_UND_AB, 0x4
+.equ BEHAVIOUR_GEHE_AUF_UND_AB_TWO, 0x4
 .equ BEHAVIOUR_GEHE_HIN_UND_HER, 0x5
-.equ BEHAVIOUR_GEHE_HIN_UND_HER, 0x6
+.equ BEHAVIOUR_GEHE_HIN_UND_HER_TWO, 0x6
 .equ BEHAVIOUR_BLICKE_NACH_OBEN, 0x7
 .equ BEHAVIOUR_BLICKE_NACH_UNTEN, 0x8
 .equ BEHAVIOUR_BLICKE_NACH_LINKS, 0x9
 .equ BEHAVIOUR_BLICKE_RUNDUM_GEGEN_DEN_UHRZEIGERSINN, 0x17
 .equ BEHAVIOUR_BLICKE_RUNDUM_IM_UHRZEIGERSINN, 0x18
 .equ BEHAVIOUR_LAUFE_AUF_UND_AB, 0x19
-.equ BEHAVIOUR_LAUFE_AUF_UND_AB, 0x1a
+.equ BEHAVIOUR_LAUFE_AUF_UND_AB_TWO, 0x1a
 .equ BEHAVIOUR_LAUFE_HIN_UND_HER, 0x1b
-.equ BEHAVIOUR_LAUFE_HIN_UND_HER, 0x1c
+.equ BEHAVIOUR_LAUFE_HIN_UND_HER_TWO, 0x1c
 .equ BEHAVIOUR_LAUFE_HOCH__RECHTS__LINKS__RUNTER, 0x1d
 .equ BEHAVIOUR_LAUFE_RECHTS__LINKS__HOCH__RUNTER, 0x1e
 .equ BEHAVIOUR_LAUFE_RUNTER__HOCH__RECHTS__LINKS, 0x1f
 .equ BEHAVIOUR_LAUFE_RECHTS__RUNTER__HOCH__LINKS, 0x24
 .equ BEHAVIOUR_LAUFE_LINKS__HOCH__RUNTER__RECHTS, 0x25
 .equ BEHAVIOUR_LAUFE_HOCH__RUNTER__RECHTS__LINKS, 0x26
-.equ BEHAVIOUR_LAUFE_RECHTS__LINKS__HOCH__RUNTER, 0x27
+.equ BEHAVIOUR_LAUFE_RECHTS__LINKS__HOCH__RUNTER_TWO, 0x27
 .equ BEHAVIOUR_LAUFE_RUNTER__RECHTS__LINKS__HOCH, 0x28
 .equ BEHAVIOUR_LAUFE_RECHTS__HOCH__RUNTER__LINKS, 0x29
 .equ BEHAVIOUR_LAUFE_HOCH__RUNTER__LINKS__RECHTS, 0x2a
 .equ BEHAVIOUR_LAUFE_LINKS__RECHTS__HOCH__RUNTER, 0x2b
 .equ BEHAVIOUR_LAUFE_RUNTER__LINKS__RECHTS__HOCH, 0x2c
 .equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN, 0x2d
-.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN, 0x2e
-.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN, 0x2f
-.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN, 0x30
-.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN, 0x31
+.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN_TWO, 0x2e
+.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN_THREE, 0x2f
+.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN_FOUR, 0x30
+.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN_FIVE, 0x31
 .equ BEHAVIOUR_LAUFE_IM_UHRZEIGERSINN, 0x32
-.equ BEHAVIOUR_LAUFE_IM_UHRZEIGERSINN, 0x33
-.equ BEHAVIOUR_LAUFE_IM_UHRZEIGERSINN, 0x34
+.equ BEHAVIOUR_LAUFE_IM_UHRZEIGERSINN_TWO, 0x33
+.equ BEHAVIOUR_LAUFE_IM_UHRZEIGERSINN_THREE, 0x34
 .equ BEHAVIOUR_SPIELER_KOPIEREN, 0x35
 .equ BEHAVIOUR_SPIELER_SPIEGELN, 0x36
-.equ BEHAVIOUR_SPIELER_SPIEGELN, 0x37
-.equ BEHAVIOUR_SPIELER_SPIEGELN, 0x38
+.equ BEHAVIOUR_SPIELER_SPIEGELN_TWO, 0x37
+.equ BEHAVIOUR_SPIELER_SPIEGELN_THREE, 0x38
 .equ BEHAVIOUR_BAUM_WAND_VERKLEIDUNG, 0x39
 .equ BEHAVIOUR_FELS_WAND_VERKLEIDUNG, 0x3a
 .equ BEHAVIOUR_SPIELER_SPIEGELN_IM_STAND, 0x3b
-.equ BEHAVIOUR_SPIELER_KOPIEREN_IM_STAND, 0x3c
-.equ BEHAVIOUR_SPIELER_SPIEGELN_IM_STAND, 0x3d
-.equ BEHAVIOUR_SPIELER_SPIEGELN_IM_STAND, 0x3e
-.equ BEHAVIOUR_VERSTECKT, 0x3f
+.equ BEHAVIOUR_SPIELER_KOPIEREN_IM_STAND_TWO, 0x3c
+.equ BEHAVIOUR_SPIELER_SPIEGELN_IM_STAND_THREE, 0x3d
+.equ BEHAVIOUR_SPIELER_SPIEGELN_IM_STAND_FOUR, 0x3e
+.equ BEHAVIOUR_VERSTECKT_TWO, 0x3f
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_UNTEN, 0x40
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_OBEN, 0x41
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_LINKS, 0x42
 .equ BEHAVIOUR_AUF_DER_STELLE_LAUFEN_OBEN, 0x49
 .equ BEHAVIOUR_AUF_DER_STELLE_LAUFEN_LINKS, 0x4a
 .equ BEHAVIOUR_AUF_DER_STELLE_LAUFEN_RECHTS, 0x4b
-.equ BEHAVIOUR_VERSTECKT, 0x4c
+.equ BEHAVIOUR_VERSTECKT_THREE, 0x4c
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_UNTEN_, 0x4d
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_OBEN_, 0x4e
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_LINKS_, 0x4f
-.equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_RECHTS, 0x50
+.equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_RECHTS_TWO, 0x50
 
 
 
 .equ MAP_MERIANA_CITY, 0x59
 .equ MAP_AKTANIA, 0x5a
 .equ MAP_SILVANIA, 0x5b
-.equ MAP_KASKADA, 0x5c
-.equ MAP_ORINA_CITY, 0x5d
-.equ MAP_INFERIOR, 0x5e
-.equ MAP_CEOMETRIA, 0x5f
-.equ MAP_ZINNOBERINSEL, 0x60
-.equ MAP_INDIGO_PLATEAU, 0x61
-.equ MAP_SAFFRONIA_CITY, 0x62
-.equ MAP_ROUTE_4, 0x63
-.equ MAP_ROUTE_10, 0x64
-.equ MAP_ROUTE_1, 0x65
-.equ MAP_ROUTE_3, 0x66
-.equ MAP_FELSIGE_OEDNIS, 0x67
-.equ MAP_ROUTE_4, 0x68
-.equ MAP_ROUTE_5, 0x69
-.equ MAP_ROUTE_6, 0x6a
-.equ MAP_ROUTE_7, 0x6b
-.equ MAP_ROUTE_8, 0x6c
-.equ MAP_ROUTE_9, 0x6d
-.equ MAP_ROUTE_10, 0x6e
-.equ MAP_ROUTE_11, 0x6f
-.equ MAP_ROUTE_12, 0x70
-.equ MAP_ROUTE_13, 0x71
-.equ MAP_ROUTE_14, 0x72
-.equ MAP_ROUTE_15, 0x73
-.equ MAP_ROUTE_16, 0x74
-.equ MAP_ROUTE_17, 0x75
-.equ MAP_ROUTE_18, 0x76
-.equ MAP_ROUTE_19, 0x77
-.equ MAP_ROUTE_20, 0x78
-.equ MAP_ROUTE_21, 0x79
-.equ MAP_ROUTE_2, 0x7a
-.equ MAP_ROUTE_23, 0x7b
-.equ MAP_ROUTE_24, 0x7c
-.equ MAP_ROUTE_25, 0x7d
-.equ MAP_SILVANIA_WALD, 0x7e
-.equ MAP_PKMN_FRIEDHOF, 0x7f
-.equ MAP_KUESTENBERG, 0x80
-.equ MAP_ASCHHAIN, 0x81
-.equ MAP_TUNNELPFAD, 0x82
-.equ MAP_WASSERPFAD, 0x83
-.equ MAP_SIEGESSTRASSE, 0x84
-.equ MAP_ROCKET_HQ, 0x85
-.equ MAP_SILPH_CO., 0x86
-.equ MAP_KUESTENBERG, 0x87
-.equ MAP_SAFARI_ZONE, 0x88
-.equ MAP_POKEMON_LIGA, 0x89
-.equ MAP_VULCANO, 0x8a
-.equ MAP_SEESCHAUMINSELN, 0x8b
-.equ MAP_POKEMON_TURM, 0x8c
-.equ MAP_AZURIA_HOEHLE, 0x8d
-.equ MAP_KRAFTWERK, 0x8e
-.equ MAP_EILAND_EINS, 0x8f
-.equ MAP_EILAND_ZWEI, 0x90
-.equ MAP_EILAND_DREI, 0x91
-.equ MAP_EILAND_VIER, 0x92
-.equ MAP_EILAND_FUENF, 0x93
-.equ MAP_EILAND_SIEBEN, 0x94
-.equ MAP_EILAND_SECHS, 0x95
-.equ MAP_GLUEHWEG, 0x96
-.equ MAP_SCHATZGESTADE, 0x97
-.equ MAP_KAP_KANTE, 0x98
-.equ MAP_BUNDBRUECKE, 0x99
-.equ MAP_TRI_EILAND_HAFEN, 0x9a
-.equ MAP_SEVII_EILAND_6, 0x9b
-.equ MAP_SEVII_EILAND_7, 0x9c
-.equ MAP_SEVII_EILAND_8, 0x9d
-.equ MAP_SEVII_EILAND_9, 0x9e
-.equ MAP_FERIENPARADIES, 0x9f
-.equ MAP_WASSERIRRGARTEN, 0xa0
-.equ MAP_EILAND_5_WEIDE, 0xa1
-.equ MAP_TRAINERSCHULE, 0xa2
-.equ MAP_FERN_EILAND, 0xa3
-.equ MAP_GRUENER_PFAD, 0xa4
-.equ MAP_WASSERWEG, 0xa5
-.equ MAP_RUINENTAL, 0xa6
-.equ MAP_TRAINERTURM, 0xa7
-.equ MAP_SCHLUCHTEINGANG, 0xa8
-.equ MAP_7_SCHATZSCHLUCHT, 0xa9
-.equ MAP_TANIBO_RUINEN, 0xaa
-.equ MAP_SEVII_EILAND_22, 0xab
-.equ MAP_SEVII_EILAND_23, 0xac
-.equ MAP_SEVII_EILAND_24, 0xad
-.equ MAP_NABELFELS, 0xae
-.equ MAP_GLUTBERG, 0xaf
-.equ MAP_BEERENFORST, 0xb0
-.equ MAP_EISKASKADENHOEHLE, 0xb1
-.equ MAP_ROCKET_LAGER, 0xb2
-.equ MAP_TRAINERTURM, 0xb3
-.equ MAP_PUNKTLOCH, 0xb4
-.equ MAP_VERLORENE_HOEHLE, 0xb5
-.equ MAP_MUSTERBUSCHWALD, 0xb6
-.equ MAP_WANDELHOEHLE, 0xb7
-.equ MAP_TANIBO_KAMMER, 0xb8
-.equ MAP_TRI_EILAND_PFAD, 0xb9
-.equ MAP_TANIBO_SCHLUESSEL, 0xba
-.equ MAP_ENTSTEHUNGSINSEL, 0xbb
-.equ MAP_WUESTENKAMMER, 0xbc
-.equ MAP_PEZWULP_KAMMER, 0xbd
-.equ MAP_DREICKE_KAMMER, 0xbe
-.equ MAP_VIERZISSE_KAMMER, 0xbf
-.equ MAP_FUENIBISKU_KAMMER, 0xc0
-.equ MAP_LILECHS_KAMMER, 0xc1
-.equ MAP_ARC_SCRIM, 0xc2
-.equ MAP_GLUTTHERME, 0xc3
-.equ MAP_PRISMANIA_EINK, 0xc4
 
 
 

src/include/script_language.h

 .word \goto_address
 .endm
 
-.macro callif if1_value:req if1_pointer:req
+.macro gotoif if1_value:req if1_pointer:req
 .byte 0x6
 .byte \if1_value
 .word \if1_pointer
 .endm
 
-.macro gotoif if2_value:req if2_pointer:req
+.macro callif if2_value:req if2_pointer:req
 .byte 0x7
 .byte \if2_value
 .word \if2_pointer