Browse Source

full out map and script compile

SBird1337 7 years ago
parent
commit
00022c29e8
7 changed files with 76 additions and 143 deletions
  1. 1
    1
      main.asm
  2. 37
    3
      makefile
  3. 4
    4
      patches/game_engine/quick_hacks.asm
  4. 7
    0
      patches/maps.asm
  5. 1
    1
      sots-private
  6. 24
    132
      src/include/pymap_constants.h
  7. 2
    2
      src/include/script_language.h

+ 1
- 1
main.asm View File

@@ -1,11 +1,11 @@
1 1
 .gba
2 2
 .thumb
3 3
 .open "base/bpre0.gba","build/pkmn_sots.gba",0x08000000
4
-
5 4
 //exclude for now
6 5
 //.include "patches/split_physical_special.asm"
7 6
 .include "patches/hooks.asm"
8 7
 
8
+.include "patches/maps.asm"
9 9
 
10 10
 .include "patches/dynamic_overworld_hooks.asm"
11 11
 

+ 37
- 3
makefile View File

@@ -10,6 +10,9 @@ PREPROC := @preproc
10 10
 VBA		:= vba
11 11
 LAN	:= de
12 12
 STRAGB	:= string2agb
13
+PYPROJS := @python ../tools/v_tools/pyproj2s.py
14
+PYMAPS	:= @python ../tools/v_tools/pymap2s.py
15
+PYSETS	:= @python ../tools/v_tools/pyset2s.py
13 16
 
14 17
 export PATH := $(realpath ../tools):$(PATH)
15 18
 
@@ -21,7 +24,7 @@ AUTO_ASSET_ROOT := sots-private/assets/images
21 24
 
22 25
 CHARMAP := charmap.txt
23 26
 
24
-DEFINES   := -DBPRE -DSOFTWARE_VERSION=0
27
+DEFINES   := -DBPRE -DSOFTWARE_VERSION=0 -DLAN_DE
25 28
 ASFLAGS   := -mthumb
26 29
 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)
27 30
 GRITFLAGS := -ftc -fa
@@ -32,7 +35,8 @@ SOURCEDIR := src
32 35
 STRINGDIR := string
33 36
 MAPROOT	  := sots-private/map
34 37
 MAPMAPS	  := $(MAPROOT)/maps
35
-MAPTS	  := $(MAPROOT)/tilesets
38
+MAPTS	  := $(MAPROOT)/tileset
39
+MAP_PROJ	:= $(MAPROOT)/sots.json
36 40
 
37 41
 MAIN_OBJ  := $(BLDPATH)/linked.o
38 42
 B_ENGINE  := battle_engine/build/linked.o
@@ -53,6 +57,10 @@ rwildcard=$(wildcard $1$2) $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2))
53 57
 
54 58
 IMAGES=$(call rwildcard,$(AUTO_ASSET_ROOT),*.png)
55 59
 
60
+TSPNG=$(call rwildcard,$(MAPTS)/,*.png)
61
+TS_GEN_SRC	:= $(TSPNG:%.png=%.s)
62
+TS_GEN_O	:= $(TSPNG:%.png=$(BLDPATH)/%.o)
63
+
56 64
 GEN_SRC		:= $(IMAGES:$(AUTO_ASSET_ROOT)/%.png=generated_image/%.c)
57 65
 ASM_SRC     := $(call rwildcard,src/,*.s)
58 66
 C_SRC       := $(call rwildcard,src/,*.c)
@@ -61,6 +69,16 @@ STRING		:= $(call rwildcard,string/$(LAN)/,*.txt)
61 69
 STRING_SRC	:= $(STRING:%.txt=%.s)
62 70
 SCRIPT_SRC	:= $(call rwildcard,$(MAPMAPS)/,*.s)
63 71
 
72
+MAP_PROJ_S	:= $(MAP_PROJ:%.json=%.s)
73
+MAP_PROJ_O	:= $(MAP_PROJ:%.json=$(BLDPATH)/%.o)
74
+
75
+MAP_FILES	:= $(call rwildcard,$(MAPMAPS)/,*.pmh)
76
+MAP_FILES_S	:= $(MAP_FILES:%.pmh=%.s)
77
+MAP_FILES_O	:= $(MAP_FILES:%.pmh=$(BLDPATH)/%.o)
78
+
79
+TS_FILES	:= $(call rwildcard,$(MAPTS)/,*.pts)
80
+TS_FILES_S	:= $(TS_FILES:%.pts=%.s)
81
+TS_FILES_O	:= $(TS_FILES:%.pts=$(BLDPATH)/%.o)
64 82
 
65 83
 GEN_OBJ		:= $(GEN_SRC:%.c=$(BLDPATH)/%.o)
66 84
 STRING_OBJ	:= $(STRING_SRC:%.s=$(BLDPATH)/%.o)
@@ -68,7 +86,15 @@ ASM_OBJ     := $(ASM_SRC:%.s=$(BLDPATH)/%.o)
68 86
 C_OBJ       := $(C_SRC:%.c=$(BLDPATH)/%.o)
69 87
 DATA_OBJ    := $(DATA_SRC:%.s=$(BLDPATH)/%.o)
70 88
 SCRIPT_OBJ	:= $(SCRIPT_SRC:%.s=$(BLDPATH)/%.o)
71
-ALL_OBJ     := $(GEN_OBJ) $(C_OBJ) $(ASM_OBJ) $(DATA_OBJ) $(STRING_OBJ) $(SCRIPT_OBJ)
89
+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)
90
+
91
+$(MAPMAPS)/%.s: $(MAPMAPS)/%.pmh
92
+	@echo -e "\e[96mGenerating map $<\e[0m"
93
+	$(PYMAPS) -o $@ $<
94
+
95
+$(MAPTS)/%.s: $(MAPTS)/%.pts
96
+	@echo -e "\e[94mGenerating tileset $<\e[0m"
97
+	$(PYSETS) -o $@ $<
72 98
 
73 99
 $(STRINGDIR)/%.s: $(STRINGDIR)/%.txt
74 100
 	@echo -e "\e[93mGenerating strings $<\e[0m"
@@ -86,6 +112,10 @@ $(BLDPATH)/%.o: %.s
86 112
 	$(CC) $(CFLAGS) -c -x assembler-with-cpp $*.i -o $@
87 113
 	@rm -f $*.i
88 114
 
115
+$(MAPTS)/%.s: $(MAPTS)/%.png
116
+	@echo -e "\e[34mProcessing image (tileset) $<\e[0m"
117
+	$(GRIT) $< -o $@ -fts -gzl -pz! -pu16 -gB4 -m! -mR!
118
+
89 119
 generated_image/%.c: $(AUTO_ASSET_ROOT)/%.png $(AUTO_ASSET_ROOT)/%.grit
90 120
 	@echo -e "\e[34mProcessing image $<\e[0m"
91 121
 	$(shell mkdir -p $(dir $@))
@@ -112,6 +142,10 @@ $(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR
112 142
 	$(LD) $(LDFLAGS) -T $(PAGB_LINK) -T linker.ld -T bpre.sym --whole-archive -r -o $@ --start-group -T $(TMP_LD) --end-group
113 143
 	@rm -f $(TMP_LD)
114 144
 
145
+$(MAP_PROJ_S): $(MAP_PROJ)
146
+	@echo -e "\e[91mGenerating map project $<\e[0m"
147
+	$(PYPROJS) -b sovereign_banks -f sovereign_footer -o $@ $<
148
+
115 149
 .PHONY: $(B_ENGINE)
116 150
 $(B_ENGINE):
117 151
 	$(MAKE) -C battle_engine build/linked.o

+ 4
- 4
patches/game_engine/quick_hacks.asm View File

@@ -72,13 +72,13 @@ PLAYER_S_M EQU 0
72 72
 .word 0x00000000
73 73
 
74 74
 .org 0x08054A08
75
-//.byte 0x7
75
+.byte 0x7
76 76
 
77 77
 .org 0x08054A00
78
-//.byte 0x13
78
+.byte 0x13
79 79
 
80 80
 .org 0x08054A04
81
-//.byte 0x5
81
+.byte 0x5
82 82
 
83 83
 .org 0x08054A06
84
-//.byte 0x0
84
+.byte 0x0

+ 7
- 0
patches/maps.asm View File

@@ -0,0 +1,7 @@
1
+/* all map bank table symbols and map footer tables go here */
2
+
3
+.org 0x0805524C
4
+.word sovereign_banks
5
+
6
+.org 0x08055194
7
+.word sovereign_footer

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 04d6d99a48f025594551fe535770abbc3b9d8075
1
+Subproject commit 8cc9cb9f32d2b30d2ac317a03f6e9a4ca1ebf80c

+ 24
- 132
src/include/pymap_constants.h View File

@@ -1336,17 +1336,17 @@
1336 1336
 .equ REGENMUT, 0x55
1337 1337
 .equ KAELTEWAHN, 0x56
1338 1338
 .equ SANDHERZ, 0x57
1339
-.equ WANDLUNGSK., 0x58
1339
+.equ WANDLUNGSKUNST, 0x58
1340 1340
 .equ TOLLWUT, 0x59
1341 1341
 .equ ZEITSPIEL, 0x5a
1342 1342
 .equ STROLCH, 0x5b
1343
-.equ ORKANSCHW., 0x5c
1343
+.equ ORKANSCHWINGE, 0x5c
1344 1344
 .equ DUNKLE_MAGIE, 0x5d
1345 1345
 .equ LERNFAEHIG, 0x5e
1346 1346
 .equ HAGELALARM, 0x5f
1347 1347
 .equ HOCHMUT, 0x60
1348 1348
 .equ AP_SPARER, 0x61
1349
-.equ TAKTIKWECHS., 0x62
1349
+.equ TAKTIKWECHSEL, 0x62
1350 1350
 .equ LUZID, 0x63
1351 1351
 .equ UNGEBROCHEN, 0x64
1352 1352
 .equ LEBENSRAEUBER, 0x65
@@ -1358,9 +1358,6 @@
1358 1358
 .equ ALLROUNDER, 0x6b
1359 1359
 .equ HITZEWAHN, 0x6c
1360 1360
 .equ GIFTWAHN, 0x6d
1361
-.equ XXX, 0x6e
1362
-.equ XXX, 0x6f
1363
-.equ XXX, 0x70
1364 1361
 
1365 1362
 
1366 1363
 
@@ -1593,9 +1590,9 @@
1593 1590
 .equ MUS_KAMPF_GEGEN_TRAINER_HOENN, 0x10a
1594 1591
 .equ MUS_CHANEIRA_TANZ, 0x10b
1595 1592
 .equ MUS_SOUND_GLUCKWUNSCH, 0x10c
1596
-.equ MUS_SOUND_GLUCKWUNSCH, 0x10d
1593
+.equ MUS_SOUND_GLUCKWUNSCH_TWO, 0x10d
1597 1594
 .equ MUS_VERRUCKTER_SOUND, 0x10e
1598
-.equ MUS_VERRUCKTER_SOUND, 0x10f
1595
+.equ MUS_VERRUCKTER_SOUND_TWO, 0x10f
1599 1596
 .equ MUS_KOMMT_MIT_SPIELER_WIRD_HERUMGEFUHRT, 0x110
1600 1597
 .equ MUS_SPIELHALLE, 0x111
1601 1598
 .equ MUS_ROCKET_HQ_AND_AZURIA_HOHLE_AND_TOP_4_BRUNO, 0x112
@@ -1702,9 +1699,9 @@
1702 1699
 .equ BEHAVIOUR_UMHERBLICKEN, 0x1
1703 1700
 .equ BEHAVIOUR_HERUMGEHEN, 0x2
1704 1701
 .equ BEHAVIOUR_GEHE_AUF_UND_AB, 0x3
1705
-.equ BEHAVIOUR_GEHE_AUF_UND_AB, 0x4
1702
+.equ BEHAVIOUR_GEHE_AUF_UND_AB_TWO, 0x4
1706 1703
 .equ BEHAVIOUR_GEHE_HIN_UND_HER, 0x5
1707
-.equ BEHAVIOUR_GEHE_HIN_UND_HER, 0x6
1704
+.equ BEHAVIOUR_GEHE_HIN_UND_HER_TWO, 0x6
1708 1705
 .equ BEHAVIOUR_BLICKE_NACH_OBEN, 0x7
1709 1706
 .equ BEHAVIOUR_BLICKE_NACH_UNTEN, 0x8
1710 1707
 .equ BEHAVIOUR_BLICKE_NACH_LINKS, 0x9
@@ -1724,9 +1721,9 @@
1724 1721
 .equ BEHAVIOUR_BLICKE_RUNDUM_GEGEN_DEN_UHRZEIGERSINN, 0x17
1725 1722
 .equ BEHAVIOUR_BLICKE_RUNDUM_IM_UHRZEIGERSINN, 0x18
1726 1723
 .equ BEHAVIOUR_LAUFE_AUF_UND_AB, 0x19
1727
-.equ BEHAVIOUR_LAUFE_AUF_UND_AB, 0x1a
1724
+.equ BEHAVIOUR_LAUFE_AUF_UND_AB_TWO, 0x1a
1728 1725
 .equ BEHAVIOUR_LAUFE_HIN_UND_HER, 0x1b
1729
-.equ BEHAVIOUR_LAUFE_HIN_UND_HER, 0x1c
1726
+.equ BEHAVIOUR_LAUFE_HIN_UND_HER_TWO, 0x1c
1730 1727
 .equ BEHAVIOUR_LAUFE_HOCH__RECHTS__LINKS__RUNTER, 0x1d
1731 1728
 .equ BEHAVIOUR_LAUFE_RECHTS__LINKS__HOCH__RUNTER, 0x1e
1732 1729
 .equ BEHAVIOUR_LAUFE_RUNTER__HOCH__RECHTS__LINKS, 0x1f
@@ -1737,31 +1734,31 @@
1737 1734
 .equ BEHAVIOUR_LAUFE_RECHTS__RUNTER__HOCH__LINKS, 0x24
1738 1735
 .equ BEHAVIOUR_LAUFE_LINKS__HOCH__RUNTER__RECHTS, 0x25
1739 1736
 .equ BEHAVIOUR_LAUFE_HOCH__RUNTER__RECHTS__LINKS, 0x26
1740
-.equ BEHAVIOUR_LAUFE_RECHTS__LINKS__HOCH__RUNTER, 0x27
1737
+.equ BEHAVIOUR_LAUFE_RECHTS__LINKS__HOCH__RUNTER_TWO, 0x27
1741 1738
 .equ BEHAVIOUR_LAUFE_RUNTER__RECHTS__LINKS__HOCH, 0x28
1742 1739
 .equ BEHAVIOUR_LAUFE_RECHTS__HOCH__RUNTER__LINKS, 0x29
1743 1740
 .equ BEHAVIOUR_LAUFE_HOCH__RUNTER__LINKS__RECHTS, 0x2a
1744 1741
 .equ BEHAVIOUR_LAUFE_LINKS__RECHTS__HOCH__RUNTER, 0x2b
1745 1742
 .equ BEHAVIOUR_LAUFE_RUNTER__LINKS__RECHTS__HOCH, 0x2c
1746 1743
 .equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN, 0x2d
1747
-.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN, 0x2e
1748
-.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN, 0x2f
1749
-.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN, 0x30
1750
-.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN, 0x31
1744
+.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN_TWO, 0x2e
1745
+.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN_THREE, 0x2f
1746
+.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN_FOUR, 0x30
1747
+.equ BEHAVIOUR_LAUFE_GEGEN_DEN_UHRZEIGERSINN_FIVE, 0x31
1751 1748
 .equ BEHAVIOUR_LAUFE_IM_UHRZEIGERSINN, 0x32
1752
-.equ BEHAVIOUR_LAUFE_IM_UHRZEIGERSINN, 0x33
1753
-.equ BEHAVIOUR_LAUFE_IM_UHRZEIGERSINN, 0x34
1749
+.equ BEHAVIOUR_LAUFE_IM_UHRZEIGERSINN_TWO, 0x33
1750
+.equ BEHAVIOUR_LAUFE_IM_UHRZEIGERSINN_THREE, 0x34
1754 1751
 .equ BEHAVIOUR_SPIELER_KOPIEREN, 0x35
1755 1752
 .equ BEHAVIOUR_SPIELER_SPIEGELN, 0x36
1756
-.equ BEHAVIOUR_SPIELER_SPIEGELN, 0x37
1757
-.equ BEHAVIOUR_SPIELER_SPIEGELN, 0x38
1753
+.equ BEHAVIOUR_SPIELER_SPIEGELN_TWO, 0x37
1754
+.equ BEHAVIOUR_SPIELER_SPIEGELN_THREE, 0x38
1758 1755
 .equ BEHAVIOUR_BAUM_WAND_VERKLEIDUNG, 0x39
1759 1756
 .equ BEHAVIOUR_FELS_WAND_VERKLEIDUNG, 0x3a
1760 1757
 .equ BEHAVIOUR_SPIELER_SPIEGELN_IM_STAND, 0x3b
1761
-.equ BEHAVIOUR_SPIELER_KOPIEREN_IM_STAND, 0x3c
1762
-.equ BEHAVIOUR_SPIELER_SPIEGELN_IM_STAND, 0x3d
1763
-.equ BEHAVIOUR_SPIELER_SPIEGELN_IM_STAND, 0x3e
1764
-.equ BEHAVIOUR_VERSTECKT, 0x3f
1758
+.equ BEHAVIOUR_SPIELER_KOPIEREN_IM_STAND_TWO, 0x3c
1759
+.equ BEHAVIOUR_SPIELER_SPIEGELN_IM_STAND_THREE, 0x3d
1760
+.equ BEHAVIOUR_SPIELER_SPIEGELN_IM_STAND_FOUR, 0x3e
1761
+.equ BEHAVIOUR_VERSTECKT_TWO, 0x3f
1765 1762
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_UNTEN, 0x40
1766 1763
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_OBEN, 0x41
1767 1764
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_LINKS, 0x42
@@ -1774,11 +1771,11 @@
1774 1771
 .equ BEHAVIOUR_AUF_DER_STELLE_LAUFEN_OBEN, 0x49
1775 1772
 .equ BEHAVIOUR_AUF_DER_STELLE_LAUFEN_LINKS, 0x4a
1776 1773
 .equ BEHAVIOUR_AUF_DER_STELLE_LAUFEN_RECHTS, 0x4b
1777
-.equ BEHAVIOUR_VERSTECKT, 0x4c
1774
+.equ BEHAVIOUR_VERSTECKT_THREE, 0x4c
1778 1775
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_UNTEN_, 0x4d
1779 1776
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_OBEN_, 0x4e
1780 1777
 .equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_LINKS_, 0x4f
1781
-.equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_RECHTS, 0x50
1778
+.equ BEHAVIOUR_AUF_DER_STELLE_GEHEN_RECHTS_TWO, 0x50
1782 1779
 
1783 1780
 
1784 1781
 
@@ -1789,111 +1786,6 @@
1789 1786
 .equ MAP_MERIANA_CITY, 0x59
1790 1787
 .equ MAP_AKTANIA, 0x5a
1791 1788
 .equ MAP_SILVANIA, 0x5b
1792
-.equ MAP_KASKADA, 0x5c
1793
-.equ MAP_ORINA_CITY, 0x5d
1794
-.equ MAP_INFERIOR, 0x5e
1795
-.equ MAP_CEOMETRIA, 0x5f
1796
-.equ MAP_ZINNOBERINSEL, 0x60
1797
-.equ MAP_INDIGO_PLATEAU, 0x61
1798
-.equ MAP_SAFFRONIA_CITY, 0x62
1799
-.equ MAP_ROUTE_4, 0x63
1800
-.equ MAP_ROUTE_10, 0x64
1801
-.equ MAP_ROUTE_1, 0x65
1802
-.equ MAP_ROUTE_3, 0x66
1803
-.equ MAP_FELSIGE_OEDNIS, 0x67
1804
-.equ MAP_ROUTE_4, 0x68
1805
-.equ MAP_ROUTE_5, 0x69
1806
-.equ MAP_ROUTE_6, 0x6a
1807
-.equ MAP_ROUTE_7, 0x6b
1808
-.equ MAP_ROUTE_8, 0x6c
1809
-.equ MAP_ROUTE_9, 0x6d
1810
-.equ MAP_ROUTE_10, 0x6e
1811
-.equ MAP_ROUTE_11, 0x6f
1812
-.equ MAP_ROUTE_12, 0x70
1813
-.equ MAP_ROUTE_13, 0x71
1814
-.equ MAP_ROUTE_14, 0x72
1815
-.equ MAP_ROUTE_15, 0x73
1816
-.equ MAP_ROUTE_16, 0x74
1817
-.equ MAP_ROUTE_17, 0x75
1818
-.equ MAP_ROUTE_18, 0x76
1819
-.equ MAP_ROUTE_19, 0x77
1820
-.equ MAP_ROUTE_20, 0x78
1821
-.equ MAP_ROUTE_21, 0x79
1822
-.equ MAP_ROUTE_2, 0x7a
1823
-.equ MAP_ROUTE_23, 0x7b
1824
-.equ MAP_ROUTE_24, 0x7c
1825
-.equ MAP_ROUTE_25, 0x7d
1826
-.equ MAP_SILVANIA_WALD, 0x7e
1827
-.equ MAP_PKMN_FRIEDHOF, 0x7f
1828
-.equ MAP_KUESTENBERG, 0x80
1829
-.equ MAP_ASCHHAIN, 0x81
1830
-.equ MAP_TUNNELPFAD, 0x82
1831
-.equ MAP_WASSERPFAD, 0x83
1832
-.equ MAP_SIEGESSTRASSE, 0x84
1833
-.equ MAP_ROCKET_HQ, 0x85
1834
-.equ MAP_SILPH_CO., 0x86
1835
-.equ MAP_KUESTENBERG, 0x87
1836
-.equ MAP_SAFARI_ZONE, 0x88
1837
-.equ MAP_POKEMON_LIGA, 0x89
1838
-.equ MAP_VULCANO, 0x8a
1839
-.equ MAP_SEESCHAUMINSELN, 0x8b
1840
-.equ MAP_POKEMON_TURM, 0x8c
1841
-.equ MAP_AZURIA_HOEHLE, 0x8d
1842
-.equ MAP_KRAFTWERK, 0x8e
1843
-.equ MAP_EILAND_EINS, 0x8f
1844
-.equ MAP_EILAND_ZWEI, 0x90
1845
-.equ MAP_EILAND_DREI, 0x91
1846
-.equ MAP_EILAND_VIER, 0x92
1847
-.equ MAP_EILAND_FUENF, 0x93
1848
-.equ MAP_EILAND_SIEBEN, 0x94
1849
-.equ MAP_EILAND_SECHS, 0x95
1850
-.equ MAP_GLUEHWEG, 0x96
1851
-.equ MAP_SCHATZGESTADE, 0x97
1852
-.equ MAP_KAP_KANTE, 0x98
1853
-.equ MAP_BUNDBRUECKE, 0x99
1854
-.equ MAP_TRI_EILAND_HAFEN, 0x9a
1855
-.equ MAP_SEVII_EILAND_6, 0x9b
1856
-.equ MAP_SEVII_EILAND_7, 0x9c
1857
-.equ MAP_SEVII_EILAND_8, 0x9d
1858
-.equ MAP_SEVII_EILAND_9, 0x9e
1859
-.equ MAP_FERIENPARADIES, 0x9f
1860
-.equ MAP_WASSERIRRGARTEN, 0xa0
1861
-.equ MAP_EILAND_5_WEIDE, 0xa1
1862
-.equ MAP_TRAINERSCHULE, 0xa2
1863
-.equ MAP_FERN_EILAND, 0xa3
1864
-.equ MAP_GRUENER_PFAD, 0xa4
1865
-.equ MAP_WASSERWEG, 0xa5
1866
-.equ MAP_RUINENTAL, 0xa6
1867
-.equ MAP_TRAINERTURM, 0xa7
1868
-.equ MAP_SCHLUCHTEINGANG, 0xa8
1869
-.equ MAP_7_SCHATZSCHLUCHT, 0xa9
1870
-.equ MAP_TANIBO_RUINEN, 0xaa
1871
-.equ MAP_SEVII_EILAND_22, 0xab
1872
-.equ MAP_SEVII_EILAND_23, 0xac
1873
-.equ MAP_SEVII_EILAND_24, 0xad
1874
-.equ MAP_NABELFELS, 0xae
1875
-.equ MAP_GLUTBERG, 0xaf
1876
-.equ MAP_BEERENFORST, 0xb0
1877
-.equ MAP_EISKASKADENHOEHLE, 0xb1
1878
-.equ MAP_ROCKET_LAGER, 0xb2
1879
-.equ MAP_TRAINERTURM, 0xb3
1880
-.equ MAP_PUNKTLOCH, 0xb4
1881
-.equ MAP_VERLORENE_HOEHLE, 0xb5
1882
-.equ MAP_MUSTERBUSCHWALD, 0xb6
1883
-.equ MAP_WANDELHOEHLE, 0xb7
1884
-.equ MAP_TANIBO_KAMMER, 0xb8
1885
-.equ MAP_TRI_EILAND_PFAD, 0xb9
1886
-.equ MAP_TANIBO_SCHLUESSEL, 0xba
1887
-.equ MAP_ENTSTEHUNGSINSEL, 0xbb
1888
-.equ MAP_WUESTENKAMMER, 0xbc
1889
-.equ MAP_PEZWULP_KAMMER, 0xbd
1890
-.equ MAP_DREICKE_KAMMER, 0xbe
1891
-.equ MAP_VIERZISSE_KAMMER, 0xbf
1892
-.equ MAP_FUENIBISKU_KAMMER, 0xc0
1893
-.equ MAP_LILECHS_KAMMER, 0xc1
1894
-.equ MAP_ARC_SCRIM, 0xc2
1895
-.equ MAP_GLUTTHERME, 0xc3
1896
-.equ MAP_PRISMANIA_EINK, 0xc4
1897 1789
 
1898 1790
 
1899 1791
 

+ 2
- 2
src/include/script_language.h View File

@@ -164,13 +164,13 @@ clearflag FLAG_ENABLE_MUSIC_OVERRIDES
164 164
 .word \goto_address
165 165
 .endm
166 166
 
167
-.macro callif if1_value:req if1_pointer:req
167
+.macro gotoif if1_value:req if1_pointer:req
168 168
 .byte 0x6
169 169
 .byte \if1_value
170 170
 .word \if1_pointer
171 171
 .endm
172 172
 
173
-.macro gotoif if2_value:req if2_pointer:req
173
+.macro callif if2_value:req if2_pointer:req
174 174
 .byte 0x7
175 175
 .byte \if2_value
176 176
 .word \if2_pointer