Skip to content

Commit 65be523

Browse files
GriffinRichardsGriffinRichards
authored
Merge pull request #675 from GriffinRichards/generate-map-constants
Generate local IDs from map.json files
2 parents b10c2f7 + 587d494 commit 65be523

File tree

233 files changed

+1345
-1295
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+1345
-1295
lines changed

‎Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,8 @@ generated: $(AUTO_GEN_TARGETS)
264264
%.rl: % ; $(GFX) $< $@
265265

266266
clean-generated:
267-
-rm -f $(AUTO_GEN_TARGETS)
267+
@rm -f $(AUTO_GEN_TARGETS)
268+
@echo "rm -f <AUTO_GEN_TARGETS>"
268269

269270
ifeq ($(MODERN),0)
270271
$(C_BUILDDIR)/agb_flash.o: CFLAGS := -O -mthumb-interwork

‎asm/macros/event.inc

+3-3
Original file line numberDiff line numberDiff line change
@@ -610,10 +610,10 @@
610610
.endm
611611

612612
@ Blocks script execution until the movements being applied to the specified (localId) object finish.
613-
@ If localId is 0, then the id of the last-moved object will be used instead. If the specified object
614-
@ is not currently being manipulated with applymovement, then this command does nothing.
613+
@ If localId is LOCALID_NONE (0), then the id of the last-moved object will be used instead.
614+
@ If the specified object is not currently being manipulated with applymovement, then this command does nothing.
615615
@ If no map is specified, then the current map is used.
616-
.macro waitmovement localId:req, map
616+
.macro waitmovement localId=LOCALID_NONE, map
617617
.ifb \map
618618
.byte 0x51
619619
.2byte \localId

‎data/maps/BirthIsland_Exterior/map.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"id": "MAP_BIRTH_ISLAND_EXTERIOR",
33
"name": "BirthIsland_Exterior",
44
"layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR",
5-
"music": "0xFFFF",
5+
"music": "MUS_NONE",
66
"region_map_section": "MAPSEC_BIRTH_ISLAND",
77
"requires_flash": false,
88
"weather": "WEATHER_NONE",
@@ -16,6 +16,7 @@
1616
"connections": null,
1717
"object_events": [
1818
{
19+
"local_id": "LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK",
1920
"type": "object",
2021
"graphics_id": "OBJ_EVENT_GFX_METEORITE",
2122
"x": 15,
@@ -30,6 +31,7 @@
3031
"flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE"
3132
},
3233
{
34+
"local_id": "LOCALID_BIRTH_ISLAND_DEOXYS",
3335
"type": "object",
3436
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
3537
"x": 15,

‎data/maps/BirthIsland_Exterior/scripts.inc

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
.set LOCALID_DEOXYS_ROCK, 1
2-
.set LOCALID_DEOXYS, 2
3-
41
BirthIsland_Exterior_MapScripts::
52
map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition
63
map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_OnResume
@@ -38,7 +35,7 @@ BirthIsland_Exterior_OnResume::
3835
BirthIsland_Exterior_EventScript_TryRemoveDeoxys::
3936
specialvar VAR_RESULT, GetBattleOutcome
4037
goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, EventScript_Return
41-
removeobject LOCALID_DEOXYS
38+
removeobject LOCALID_BIRTH_ISLAND_DEOXYS
4239
return
4340

4441
BirthIsland_Exterior_EventScript_Triangle::
@@ -68,21 +65,21 @@ BirthIsland_Exterior_EventScript_NotSolved3::
6865
end
6966

7067
BirthIsland_Exterior_EventScript_Deoxys::
71-
addobject LOCALID_DEOXYS
68+
addobject LOCALID_BIRTH_ISLAND_DEOXYS
7269
waitse
73-
setfieldeffectargument 0, LOCALID_DEOXYS_ROCK
70+
setfieldeffectargument 0, LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK
7471
setfieldeffectargument 1, MAP_NUM(MAP_BIRTH_ISLAND_EXTERIOR)
7572
setfieldeffectargument 2, MAP_GROUP(MAP_BIRTH_ISLAND_EXTERIOR)
7673
dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
7774
playbgm MUS_ENCOUNTER_DEOXYS, 0
7875
waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
79-
applymovement LOCALID_DEOXYS, Movement_DeoxysApproach
76+
applymovement LOCALID_BIRTH_ISLAND_DEOXYS, Movement_DeoxysApproach
8077
waitmovement 0
8178
waitse
8279
playmoncry SPECIES_DEOXYS, CRY_MODE_ENCOUNTER
8380
delay 40
8481
waitmoncry
85-
setvar VAR_LAST_TALKED, LOCALID_DEOXYS
82+
setvar VAR_LAST_TALKED, LOCALID_BIRTH_ISLAND_DEOXYS
8683
seteventmon SPECIES_DEOXYS, 30
8784
setflag FLAG_SYS_SPECIAL_WILD_BATTLE
8885
special StartLegendaryBattle

‎data/maps/BirthIsland_Harbor/map.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"id": "MAP_BIRTH_ISLAND_HARBOR",
33
"name": "BirthIsland_Harbor",
44
"layout": "LAYOUT_ISLAND_HARBOR",
5-
"music": "0xFFFF",
5+
"music": "MUS_NONE",
66
"region_map_section": "MAPSEC_BIRTH_ISLAND",
77
"requires_flash": false,
88
"weather": "WEATHER_NONE",

‎data/maps/CeladonCity/map.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"flag": "FLAG_HIDE_CELADON_ROCKETS"
4242
},
4343
{
44+
"local_id": "LOCALID_CELADON_FAT_MAN",
4445
"type": "object",
4546
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
4647
"x": 38,
@@ -55,6 +56,7 @@
5556
"flag": "0"
5657
},
5758
{
59+
"local_id": "LOCALID_CELADON_POLIWRATH",
5860
"type": "object",
5961
"graphics_id": "OBJ_EVENT_GFX_POLIWRATH",
6062
"x": 36,
@@ -153,6 +155,7 @@
153155
"flag": "0"
154156
},
155157
{
158+
"local_id": "LOCALID_CELADON_BORDER_TREE",
156159
"type": "object",
157160
"graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
158161
"x": 52,
@@ -199,7 +202,7 @@
199202
"graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
200203
"x": -7,
201204
"y": 21,
202-
"target_local_id": 7,
205+
"target_local_id": "LOCALID_ROUTE16_CUT_TREE",
203206
"target_map": "MAP_ROUTE16"
204207
},
205208
{
@@ -407,7 +410,7 @@
407410
"x": 48,
408411
"y": 12,
409412
"respawn_map": "MAP_CELADON_CITY_POKEMON_CENTER_1F",
410-
"respawn_npc": 1
413+
"respawn_npc": "LOCALID_CELADON_NURSE"
411414
}
412415
]
413416
}

‎data/maps/CeladonCity/scripts.inc

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
.set LOCALID_FAT_MAN, 2
2-
.set LOCALID_POLIWRATH, 3
3-
41
CeladonCity_MapScripts::
52
map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_OnTransition
63
.byte 0
@@ -36,7 +33,7 @@ CeladonCity_EventScript_FatMan::
3633
faceplayer
3734
msgbox CeladonCity_Text_MyTrustedPalPoliwrath
3835
closemessage
39-
applymovement LOCALID_FAT_MAN, Common_Movement_FaceOriginalDirection
36+
applymovement LOCALID_CELADON_FAT_MAN, Common_Movement_FaceOriginalDirection
4037
waitmovement 0
4138
release
4239
end
@@ -49,7 +46,7 @@ CeladonCity_EventScript_Poliwrath::
4946
msgbox CeladonCity_Text_Poliwrath
5047
closemessage
5148
waitmoncry
52-
applymovement LOCALID_POLIWRATH, Common_Movement_FaceOriginalDirection
49+
applymovement LOCALID_CELADON_POLIWRATH, Common_Movement_FaceOriginalDirection
5350
waitmovement 0
5451
release
5552
end

‎data/maps/CeladonCity_Condominiums_RoofRoom/map.json

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"flag": "0"
3131
},
3232
{
33+
"local_id": "LOCALID_EEVEE_POKEBALL",
3334
"type": "object",
3435
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
3536
"x": 7,

‎data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
.set LOCALID_EEVEE_POKEBALL, 2
2-
31
CeladonCity_Condominiums_RoofRoom_MapScripts::
42
.byte 0
53

‎data/maps/CeladonCity_GameCorner/map.json

+1
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
"flag": "0"
157157
},
158158
{
159+
"local_id": "LOCALID_GAME_CORNER_GRUNT",
159160
"type": "object",
160161
"graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
161162
"x": 11,

‎data/maps/CeladonCity_GameCorner/scripts.inc

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
.set LOCALID_GRUNT, 11
2-
31
CeladonCity_GameCorner_MapScripts::
42
map_script MAP_SCRIPT_ON_LOAD, CeladonCity_GameCorner_OnLoad
53
.byte 0
@@ -246,7 +244,7 @@ CeladonCity_GameCorner_EventScript_SlotMachine::
246244
goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase
247245
msgbox CeladonCity_GameCorner_Text_SlotMachineWantToPlay, MSGBOX_YESNO
248246
goto_if_eq VAR_RESULT, NO, CeladonCity_GameCorner_EventScript_DontPlaySlotMachine
249-
setfieldeffectargument 0, OBJ_EVENT_ID_PLAYER
247+
setfieldeffectargument 0, LOCALID_PLAYER
250248
.ifdef BUGFIX
251249
setfieldeffectargument 1, MAP_NUM(MAP_CELADON_CITY_GAME_CORNER)
252250
setfieldeffectargument 2, MAP_GROUP(MAP_CELADON_CITY_GAME_CORNER)
@@ -421,17 +419,17 @@ CeladonCity_GameCorner_Text_DefeatedGrunt::
421419
closemessage
422420
call_if_eq VAR_FACING, DIR_WEST, CeladonCity_GameCorner_Text_GruntExitWest
423421
call_if_ne VAR_FACING, DIR_WEST, CeladonCity_GameCorner_Text_GruntExit
424-
removeobject LOCALID_GRUNT
422+
removeobject LOCALID_GAME_CORNER_GRUNT
425423
release
426424
end
427425

428426
CeladonCity_GameCorner_Text_GruntExitWest::
429-
applymovement LOCALID_GRUNT, CeladonCity_GameCorner_Movement_GruntExitWest
427+
applymovement LOCALID_GAME_CORNER_GRUNT, CeladonCity_GameCorner_Movement_GruntExitWest
430428
waitmovement 0
431429
return
432430

433431
CeladonCity_GameCorner_Text_GruntExit::
434-
applymovement LOCALID_GRUNT, CeladonCity_GameCorner_Movement_GruntExit
432+
applymovement LOCALID_GAME_CORNER_GRUNT, CeladonCity_GameCorner_Movement_GruntExit
435433
waitmovement 0
436434
return
437435

‎data/maps/CeladonCity_PokemonCenter_1F/map.json

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"connections": null,
1717
"object_events": [
1818
{
19+
"local_id": "LOCALID_CELADON_NURSE",
1920
"type": "object",
2021
"graphics_id": "OBJ_EVENT_GFX_NURSE",
2122
"x": 7,

‎data/maps/CeruleanCity/map.json

+9-2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
],
3838
"object_events": [
3939
{
40+
"local_id": "LOCALID_CERULEAN_POLICEMAN",
4041
"type": "object",
4142
"graphics_id": "OBJ_EVENT_GFX_POLICEMAN",
4243
"x": 31,
@@ -51,6 +52,7 @@
5152
"flag": "0"
5253
},
5354
{
55+
"local_id": "LOCALID_CERULEAN_GRUNT",
5456
"type": "object",
5557
"graphics_id": "OBJ_EVENT_GFX_ROCKET_M",
5658
"x": 33,
@@ -93,6 +95,7 @@
9395
"flag": "0"
9496
},
9597
{
98+
"local_id": "LOCALID_CERULEAN_SLOWBRO",
9699
"type": "object",
97100
"graphics_id": "OBJ_EVENT_GFX_SLOWBRO",
98101
"x": 32,
@@ -107,6 +110,7 @@
107110
"flag": "0"
108111
},
109112
{
113+
"local_id": "LOCALID_CERULEAN_LASS",
110114
"type": "object",
111115
"graphics_id": "OBJ_EVENT_GFX_LASS",
112116
"x": 33,
@@ -135,6 +139,7 @@
135139
"flag": "0"
136140
},
137141
{
142+
"local_id": "LOCALID_CERULEAN_RIVAL",
138143
"type": "object",
139144
"graphics_id": "OBJ_EVENT_GFX_BLUE",
140145
"x": 22,
@@ -167,10 +172,11 @@
167172
"graphics_id": "OBJ_EVENT_GFX_CUT_TREE",
168173
"x": 50,
169174
"y": 18,
170-
"target_local_id": 10,
175+
"target_local_id": "LOCALID_ROUTE9_CUT_TREE",
171176
"target_map": "MAP_ROUTE9"
172177
},
173178
{
179+
"local_id": "LOCALID_CERULEAN_WOMAN",
174180
"type": "object",
175181
"graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
176182
"x": 12,
@@ -185,6 +191,7 @@
185191
"flag": "0"
186192
},
187193
{
194+
"local_id": "LOCALID_CERULEAN_CAVE_GUARD",
188195
"type": "object",
189196
"graphics_id": "OBJ_EVENT_GFX_COOLTRAINER_M",
190197
"x": 1,
@@ -420,7 +427,7 @@
420427
"x": 22,
421428
"y": 20,
422429
"respawn_map": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F",
423-
"respawn_npc": 1
430+
"respawn_npc": "LOCALID_CERULEAN_NURSE"
424431
}
425432
]
426433
}

0 commit comments

Comments
 (0)