diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-21 00:02:21 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-21 00:02:21 -0400 |
| commit | 5631bdc0d7f90d5036b71489883d787715983d41 (patch) | |
| tree | 59d21b35a7af8686f62e41171c7fde7eeb60cb64 | |
| parent | 471492b775fc2a0f5162f3d1c13c5472359beb14 (diff) | |
Added labels to different parts of the map script and event headers
395 files changed, 2403 insertions, 2390 deletions
diff --git a/engine/color.asm b/engine/color.asm index de318e54c..1a28e1104 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -1941,7 +1941,7 @@ Functionb1de: ; b1de callba Function494ac jr c, .asm_b230 - ld a, [wRoofPalette] + ld a, [wPermission] and 7 ld e, a ld d, 0 @@ -2007,7 +2007,7 @@ endr ld a, $5 ; BANK(Unkn2Pals) call FarCopyWRAM - ld a, [wRoofPalette] + ld a, [wPermission] cp 1 jr z, .asm_b253 cp 2 diff --git a/engine/events_2.asm b/engine/events_2.asm index cbcbaebb7..bca1ec27b 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -146,7 +146,7 @@ Function97cfd:: ; 97cfd ld hl, StatusFlags bit 5, [hl] jr nz, .asm_97d21 - ld a, [wRoofPalette] + ld a, [wPermission] cp $4 jr z, .asm_97d17 cp $7 diff --git a/home/flag.asm b/home/flag.asm index 389dd4910..b4dff4531 100644 --- a/home/flag.asm +++ b/home/flag.asm @@ -14,7 +14,7 @@ ResetBikeFlags:: ; 2e56 ; 2e5d ResetFlashIfOutOfCave:: ; 2e5d - ld a, [wRoofPalette] + ld a, [wPermission] cp $2 jr z, .asm_2e69 cp $1 diff --git a/items/item_effects.asm b/items/item_effects.asm index 5cffc6afb..31403dc78 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -2506,7 +2506,7 @@ Function_0xf5b1: ; f5b1 Itemfinder: ; f5b8 - callba Function12580 + callba ItemFinder ret ; f5bf @@ -12789,8 +12789,8 @@ MovementData_0x12579: ; 0x12579 ; 0x12580 -Function12580: ; 12580 - callba Functionb8172 +ItemFinder: ; 12580 + callba CheckForSignpostItems jr c, .asm_1258d ld hl, UnknownScript_0x125ba jr .asm_12590 @@ -41327,7 +41327,7 @@ Function494ac: ; 494ac ret .ice_path - ld a, [wRoofPalette] ; permission + ld a, [wPermission] ; permission and 7 cp 3 ; Hall of Fame jr z, .do_nothing @@ -52472,7 +52472,7 @@ VarActionTable: ; 80671 dwb MapGroup, $00 dwb MapNumber, $00 dwb Function806ff, $80 - dwb wRoofPalette, $00 + dwb wPermission, $00 dwb Function80715, $80 dwb wd46c, $00 dwb XCoord, $00 @@ -64097,7 +64097,7 @@ Function8c365: ; 8c365 (23:4365) jr nc, .asm_8c375 set 0, e .asm_8c375 - ld a, [wRoofPalette] + ld a, [wPermission] cp $4 jr z, .asm_8c386 cp $5 @@ -65623,13 +65623,13 @@ Function8ceae: ; 8ceae ld [rSVBK], a ld a, [TimeOfDayPal] push af - ld a, [wRoofPalette] + ld a, [wPermission] push af ld a, [TimeOfDay] and $3 ld [TimeOfDayPal], a ld a, $1 - ld [wRoofPalette], a + ld [wPermission], a ld b, $9 call GetSGBLayout call UpdateTimePals @@ -65640,7 +65640,7 @@ Function8ceae: ; 8ceae ld a, [rOBP1] ld [wcfc9], a pop af - ld [wRoofPalette], a + ld [wPermission], a pop af ld [TimeOfDayPal], a pop af @@ -69283,7 +69283,7 @@ Function90178: ; 90178 (24:4178) ret Function90188: ; 90188 - ld a, [wRoofPalette] + ld a, [wPermission] cp $1 jr z, .asm_90195 cp $2 @@ -76090,15 +76090,15 @@ Functionb8101: ; b8101 (2e:4101) ld c, $0 push hl ld hl, StringBuffer1 -.asm_b8107 +.loop ld a, [hli] cp $50 - jr z, .asm_b8113 + jr z, .stop cp $25 - jr z, .asm_b8107 + jr z, .loop inc c - jr .asm_b8107 -.asm_b8113 + jr .loop +.stop pop hl ret @@ -76113,19 +76113,19 @@ rept 2 inc c endr ld a, $87 -.asm_b811f +.loop push bc push hl -.asm_b8121 +.inner_loop ld [hli], a dec c - jr nz, .asm_b8121 + jr nz, .inner_loop pop hl ld de, SCREEN_WIDTH add hl, de pop bc dec b - jr nz, .asm_b811f + jr nz, .loop ret ; b812f @@ -76134,94 +76134,105 @@ Functionb812f: ; b812f ld a, $61 ld [hli], a ld a, $62 - call Functionb8164 + call .Fill5Words ld a, $64 ld [hli], a ld a, $65 ld [hli], a - call Functionb815b + call .Fill18Bytes ld a, $6b ld [hli], a ld a, $66 ld [hli], a - call Functionb815b + call .Fill18Bytes ld a, $6c ld [hli], a ld a, $67 ld [hli], a ld a, $68 - call Functionb8164 + call .Fill5Words ld a, $6a ld [hl], a ret ; b815b -Functionb815b: ; b815b - ld c, $12 +.Fill18Bytes: ; b815b + ld c, 18 ld a, $6d -.asm_b815f +.loop ld [hli], a dec c - jr nz, .asm_b815f + jr nz, .loop ret ; b8164 -Functionb8164: ; b8164 - ld c, $5 - jr .asm_b816a +.Fill5Words: ; b8164 + ld c, 5 + jr .enterloop -.asm_b8168 +.continueloop rept 2 ld [hli], a endr -.asm_b816a +.enterloop inc a rept 2 ld [hli], a endr dec a dec c - jr nz, .asm_b8168 + jr nz, .continueloop ret ; b8172 -Functionb8172: ; b8172 +CheckForSignpostItems: ; b8172 +; Checks to see if there are hidden items on the screen that have not yet been found. If it finds one, returns carry. call GetMapScriptHeaderBank ld [Buffer1], a +; Get the coordinate of the bottom right corner of the screen, and load it in wd1ec/wd1ed. ld a, [XCoord] - add $5 + add SCREEN_WIDTH / 4 ld [wd1ed], a ld a, [YCoord] - add $4 + add SCREEN_HEIGHT / 4 ld [wd1ec], a +; Get the pointer for the first signpost header in the map... ld hl, wdc02 ld a, [hli] ld h, [hl] ld l, a +; ... before even checking to see if there are any signposts on this map. ld a, [wCurrentMapSignpostCount] and a - jr z, .asm_b81dd -.asm_b8194 + jr z, .nosignpostitems +; For i = 1:wCurrentMapSignpostCount... +.loop +; Store the counter in Buffer2, and store the signpost header pointer in the stack. ld [Buffer2], a push hl - call Functionb81e2 +; Get the Y coordinate of the signpost. + call .GetFarByte ld e, a +; Is the Y coordinate of the signpost on the screen? If not, go to the next signpost. ld a, [wd1ec] sub e - jr c, .asm_b81d2 - cp $9 - jr nc, .asm_b81d2 - call Functionb81e2 + jr c, .next + cp SCREEN_HEIGHT / 2 + jr nc, .next +; Is the X coordinate of the signpost on the screen? If not, go to the next signpost. + call .GetFarByte ld d, a ld a, [wd1ed] sub d - jr c, .asm_b81d2 - cp $a - jr nc, .asm_b81d2 - call Functionb81e2 - cp $7 - jr nz, .asm_b81d2 + jr c, .next + cp SCREEN_WIDTH / 2 + jr nc, .next +; Is this signpost a hidden item? If not, go to the next signpost. + call .GetFarByte + cp SIGNPOST_ITEM + jr nz, .next +; Has this item already been found? If not, set off the Itemfinder. ld a, [Buffer1] call GetFarHalfword ld a, [Buffer1] @@ -76232,27 +76243,29 @@ Functionb8172: ; b8172 call EventFlagAction ld a, c and a - jr z, .asm_b81df + jr z, .itemnearby -.asm_b81d2 +.next +; Restore the signpost header pointer and increment it by the length of a signpost header. pop hl - ld bc, $0005 + ld bc, 5 add hl, bc +; Restore the signpost counter and decrement it. If it hits zero, there are no hidden items in range. ld a, [Buffer2] dec a - jr nz, .asm_b8194 + jr nz, .loop -.asm_b81dd +.nosignpostitems xor a ret -.asm_b81df +.itemnearby pop hl scf ret ; b81e2 -Functionb81e2: ; b81e2 +.GetFarByte: ; b81e2 ld a, [Buffer1] call GetFarByte inc hl diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 134bfd8ab..263995d6d 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -1,8 +1,8 @@ AzaleaGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 BugsyScript_0x18ec1e: @@ -356,20 +356,20 @@ AzaleaGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $f, $4, 5, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $f, $5, 5, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 13, 3, SIGNPOST_READ, AzaleaGymStatue signpost 13, 6, SIGNPOST_READ, AzaleaGymStatue - ; people-events +.PersonEvents: db 7 person_event SPRITE_BUGSY, 11, 9, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BugsyScript_0x18ec1e, -1 person_event SPRITE_BUG_CATCHER, 7, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherBug_catcher_benny, -1 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 490bce32f..ab03d588f 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -1,8 +1,8 @@ AzaleaMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x18e040: @@ -44,18 +44,18 @@ AzaleaMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $7, $3, 3, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x18e040, -1 person_event SPRITE_COOLTRAINER_M, 9, 6, OW_UP | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x18e047, -1 diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm index 74d0782ef..344d258d7 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokeCenter1F.asm @@ -1,11 +1,11 @@ AzaleaPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x18db27, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x18db27: @@ -76,19 +76,19 @@ AzaleaPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $7, $4, 1, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x18db28, -1 person_event SPRITE_GENTLEMAN, 10, 13, OW_UP | $0, $10, -1, -1, $0, 0, GentlemanScript_0x18db2b, -1 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 48572a0e6..c77258a31 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -1,5 +1,5 @@ AzaleaTown_MapScriptHeader: - ; trigger count +.MapTriggers: db 3 ; triggers @@ -7,7 +7,7 @@ AzaleaTown_MapScriptHeader: dw .Trigger2, $0000 dw .Trigger3, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -450,7 +450,7 @@ AzaleaTown_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 8 warp_def $9, $f, 1, GROUP_AZALEA_POKECENTER_1F, MAP_AZALEA_POKECENTER_1F warp_def $d, $15, 1, GROUP_CHARCOAL_KILN, MAP_CHARCOAL_KILN @@ -461,13 +461,13 @@ AzaleaTown_MapEventHeader: warp_def $a, $2, 3, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE warp_def $b, $2, 4, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE - ; xy triggers +.XYTriggers: db 3 xy_trigger 1, $a, $5, $0, UnknownScript_0x198018, $0, $0 xy_trigger 1, $b, $5, $0, UnknownScript_0x198034, $0, $0 xy_trigger 2, $6, $9, $0, UnknownScript_0x1980e5, $0, $0 - ; signposts +.Signposts: db 9 signpost 9, 19, SIGNPOST_READ, AzaleaTownSign signpost 9, 10, SIGNPOST_READ, KurtsHouseSign @@ -479,7 +479,7 @@ AzaleaTown_MapEventHeader: signpost 9, 3, SIGNPOST_READ, AzaleaTownIlextForestSign signpost 6, 31, SIGNPOST_ITEM, MapAzaleaTownSignpostItem8 - ; people-events +.PersonEvents: db 12 person_event SPRITE_AZALEA_ROCKET, 13, 35, OW_UP | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET person_event SPRITE_GRAMPS, 13, 25, OW_DOWN | $2, $21, -1, -1, $0, 0, GrampsScript_0x1980b1, -1 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 959a3f951..fa5247b77 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -1,12 +1,12 @@ BattleTower1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x9e39d, $0000 dw UnknownScript_0x9e3d3, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x9e39d: @@ -795,20 +795,20 @@ BattleTower1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $9, $7, 3, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE warp_def $9, $8, 4, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE warp_def $0, $7, 1, GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 6, 6, SIGNPOST_READ, MapBattleTower1FSignpost0Script - ; people-events +.PersonEvents: db 5 person_event SPRITE_RECEPTIONIST, 10, 11, OW_UP | $2, $0, -1, -1, $0, 0, ReceptionistScript_0x9e3e2, -1 person_event SPRITE_YOUNGSTER, 13, 18, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, YoungsterScript_0x9e55d, -1 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 2bb4b2bdc..82753c221 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -1,12 +1,12 @@ BattleTowerBattleRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x9f419, $0000 dw UnknownScript_0x9f420, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x9f419: @@ -142,18 +142,18 @@ BattleTowerBattleRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $3, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY warp_def $7, $4, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_YOUNGSTER, 4, 8, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER person_event SPRITE_RECEPTIONIST, 10, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ObjectEvent, -1 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 39c2dc0cc..dafc0b3ff 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -1,12 +1,12 @@ BattleTowerElevator_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x9f562, $0000 dw UnknownScript_0x9f567, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x9f562: @@ -47,17 +47,17 @@ BattleTowerElevator_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $1, 1, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY warp_def $3, $2, 1, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_RECEPTIONIST, 6, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, MovementData_0x9f58f, -1 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index f4f73b3c8..311f8cc0f 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -1,12 +1,12 @@ BattleTowerHallway_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x9f5bb, $0000 dw UnknownScript_0x9f5c0, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x9f5bb: @@ -79,7 +79,7 @@ BattleTowerHallway_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $1, $b, 1, GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR warp_def $0, $5, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM @@ -88,12 +88,12 @@ BattleTowerHallway_MapEventHeader: warp_def $0, $d, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM warp_def $0, $f, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_RECEPTIONIST, 6, 15, OW_UP | $2, $0, -1, -1, $0, 0, BattleTowerHallway_MapEventHeader, -1 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 39eb008f7..fe6374fe9 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -1,8 +1,8 @@ BattleTowerOutside_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -126,21 +126,21 @@ BattleTowerOutside_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $15, $8, 3, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE warp_def $15, $9, 4, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE warp_def $9, $8, 1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F warp_def $9, $9, 2, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 10, 10, SIGNPOST_READ, MapBattleTowerOutsideSignpost0Script - ; people-events +.PersonEvents: db 4 person_event SPRITE_STANDING_YOUNGSTER, 16, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, StandingYoungsterScript_0x9f85f, -1 person_event SPRITE_BUENA, 15, 17, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BuenaScript_0x9f862, -1 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 424df7ac0..80c57851b 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -1,8 +1,8 @@ BillsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GrampsScript_0x189538: @@ -354,17 +354,17 @@ BillsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_ROUTE_25, MAP_ROUTE_25 warp_def $7, $3, 1, GROUP_ROUTE_25, MAP_ROUTE_25 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_GRAMPS, 7, 6, OW_UP | $3, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x189538, -1 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 0c062702b..acf85e29e 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -1,8 +1,8 @@ BlackthornCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -307,7 +307,7 @@ BlackthornCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 8 warp_def $b, $12, 1, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F warp_def $15, $d, 1, GROUP_BLACKTHORN_DRAGON_SPEECH_HOUSE, MAP_BLACKTHORN_DRAGON_SPEECH_HOUSE @@ -318,10 +318,10 @@ BlackthornCity_MapEventHeader: warp_def $9, $24, 2, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F warp_def $1, $14, 1, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 7 signpost 24, 34, SIGNPOST_READ, BlackthornCitySign signpost 13, 17, SIGNPOST_READ, BlackthornGymSign @@ -331,7 +331,7 @@ BlackthornCity_MapEventHeader: signpost 29, 16, SIGNPOST_READ, BlackthornCityMartSign signpost 29, 22, SIGNPOST_READ, BlackthornCityPokeCenterSign - ; people-events +.PersonEvents: db 9 person_event SPRITE_SUPER_NERD, 16, 22, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM person_event SPRITE_SUPER_NERD, 16, 23, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM diff --git a/maps/BlackthornDodrioTradeHouse.asm b/maps/BlackthornDodrioTradeHouse.asm index 5c3914cc7..a841b0ec2 100644 --- a/maps/BlackthornDodrioTradeHouse.asm +++ b/maps/BlackthornDodrioTradeHouse.asm @@ -1,8 +1,8 @@ BlackthornDodrioTradeHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 Emy: @@ -20,19 +20,19 @@ BlackthornDodrioTradeHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $7, $3, 3, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, EmysHouseBookshelf signpost 1, 1, SIGNPOST_READ, EmysHouseBookshelf - ; people-events +.PersonEvents: db 1 person_event SPRITE_LASS, 7, 6, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, Emy, -1 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 8f0ef482d..75ea0894f 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -1,8 +1,8 @@ BlackthornDragonSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GrannyScript_0x195949: @@ -45,18 +45,18 @@ BlackthornDragonSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $7, $3, 2, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_GRANNY, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, GrannyScript_0x195949, -1 person_event SPRITE_EKANS, 9, 9, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, EkansScript_0x19594c, -1 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index e015b358f..27701ded6 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -1,8 +1,8 @@ BlackthornGym1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -384,7 +384,7 @@ BlackthornGym1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 7 warp_def $11, $4, 1, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $11, $5, 1, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY @@ -394,15 +394,15 @@ BlackthornGym1F_MapEventHeader: warp_def $7, $7, 4, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F warp_def $6, $7, 5, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 15, 3, SIGNPOST_READ, BlackthornGymStatue signpost 15, 6, SIGNPOST_READ, BlackthornGymStatue - ; people-events +.PersonEvents: db 5 person_event SPRITE_CLAIR, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClairScript_0x194e24, -1 person_event SPRITE_COOLTRAINER_M, 10, 10, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermMike, -1 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 79e465ef7..0286367e3 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -1,8 +1,8 @@ BlackthornGym2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -129,7 +129,7 @@ BlackthornGym2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $7, $1, 3, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F warp_def $9, $7, 4, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F @@ -137,13 +137,13 @@ BlackthornGym2F_MapEventHeader: warp_def $7, $8, 6, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F warp_def $3, $8, 7, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 8 person_event SPRITE_COOLTRAINER_M, 5, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainermCody, -1 person_event SPRITE_COOLTRAINER_F, 15, 8, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainerfFran, -1 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index fca08d167..784e97203 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -1,8 +1,8 @@ BlackthornMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x195a5d: @@ -45,18 +45,18 @@ BlackthornMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $7, $3, 4, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x195a5d, -1 person_event SPRITE_COOLTRAINER_M, 10, 11, OW_UP | $1, $2, -1, -1, $0, 0, CooltrainerMScript_0x195a64, -1 diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokeCenter1F.asm index 99c06eece..1f766c544 100644 --- a/maps/BlackthornPokeCenter1F.asm +++ b/maps/BlackthornPokeCenter1F.asm @@ -1,8 +1,8 @@ BlackthornPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x195b79: @@ -47,19 +47,19 @@ BlackthornPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 5, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $7, $4, 5, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x195b79, -1 person_event SPRITE_GENTLEMAN, 7, 9, OW_UP | $2, $0, -1, -1, $0, 0, GentlemanScript_0x195b7c, -1 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 8a47e0ee4..c4ed75fe3 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -1,8 +1,8 @@ BluesHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 DaisyScript_0x19b0d0: @@ -145,17 +145,17 @@ BluesHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_PALLET_TOWN, MAP_PALLET_TOWN warp_def $7, $3, 2, GROUP_PALLET_TOWN, MAP_PALLET_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_DAISY, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, DaisyScript_0x19b0d0, -1 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index b9fc57716..d5c1be4ac 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -1,12 +1,12 @@ BrunosRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x180993, $0000 dw UnknownScript_0x180997, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -130,19 +130,19 @@ BrunosRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $11, $4, 3, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM warp_def $11, $5, 4, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM warp_def $2, $4, 1, GROUP_KARENS_ROOM, MAP_KARENS_ROOM warp_def $2, $5, 2, GROUP_KARENS_ROOM, MAP_KARENS_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_BRUNO, 11, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BrunoScript_0x1809c5, -1 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 83ada2bcc..b1e0dc278 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -1,5 +1,5 @@ BurnedTower1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 3 ; triggers @@ -7,7 +7,7 @@ BurnedTower1F_MapScriptHeader: dw UnknownScript_0x185bf6, $0000 dw UnknownScript_0x185bf7, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -281,7 +281,7 @@ BurnedTower1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 14 warp_def $f, $9, 13, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $f, $a, 13, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY @@ -298,16 +298,16 @@ BurnedTower1F_MapEventHeader: warp_def $e, $f, 5, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F warp_def $f, $7, 6, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F - ; xy triggers +.XYTriggers: db 1 xy_trigger 1, $9, $b, $0, UnknownScript_0x185c25, $0, $0 - ; signposts +.Signposts: db 2 signpost 7, 8, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem0 signpost 11, 13, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem1 - ; people-events +.PersonEvents: db 5 person_event SPRITE_ROCK, 8, 19, OW_LEFT | $10, $0, -1, -1, $0, 0, BurnedTower1FRock, -1 person_event SPRITE_SUPER_NERD, 16, 16, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 06fbea65b..0b88c21c5 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -1,12 +1,12 @@ BurnedTowerB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x18615e, $0000 dw UnknownScript_0x18615f, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -233,7 +233,7 @@ BurnedTowerB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $9, $a, 3, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F warp_def $7, $11, 7, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F @@ -242,14 +242,14 @@ BurnedTowerB1F_MapEventHeader: warp_def $e, $11, 12, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F warp_def $f, $7, 14, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $6, $a, $0, UnknownScript_0x18616b, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 9 person_event SPRITE_BOULDER, 12, 21, OW_LEFT | $11, $0, -1, -1, $0, 0, BurnedTowerB1FBoulder, -1 person_event SPRITE_RAIKOU, 7, 11, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 38b86f52e..63e8a4f92 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -1,8 +1,8 @@ CeladonCafe_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SuperNerdScript_0x73049: @@ -204,20 +204,20 @@ CeladonCafe_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $6, 9, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $7, $7, 9, GROUP_CELADON_CITY, MAP_CELADON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 0, 5, SIGNPOST_READ, EatathonContestPoster signpost 1, 7, SIGNPOST_READ, CeladonCafeTrashcan - ; people-events +.PersonEvents: db 5 person_event SPRITE_SUPER_NERD, 7, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, SuperNerdScript_0x73049, -1 person_event SPRITE_FISHER, 10, 8, OW_LEFT | $0, $0, -1, -1, $0, 0, FisherScript_0x73051, -1 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 75f395360..1d595b448 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -1,8 +1,8 @@ CeladonCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -229,7 +229,7 @@ CeladonCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 9 warp_def $9, $4, 1, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F warp_def $9, $10, 1, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F @@ -241,10 +241,10 @@ CeladonCity_MapEventHeader: warp_def $1d, $a, 1, GROUP_CELADON_GYM, MAP_CELADON_GYM warp_def $1d, $19, 1, GROUP_CELADON_CAFE, MAP_CELADON_CAFE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 8 signpost 21, 23, SIGNPOST_READ, CeladonCitySign signpost 31, 11, SIGNPOST_READ, CeladonGymSign @@ -255,7 +255,7 @@ CeladonCity_MapEventHeader: signpost 9, 30, SIGNPOST_READ, CeladonCityPokeCenterSign signpost 21, 37, SIGNPOST_ITEM, MapCeladonCitySignpostItem7 - ; people-events +.PersonEvents: db 9 person_event SPRITE_FISHER, 15, 30, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a9f43, -1 person_event SPRITE_POLIWAG, 15, 31, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeladonCityPoliwrath, -1 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 47cc26ac9..fb3b38222 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -1,8 +1,8 @@ CeladonDeptStore1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ReceptionistScript_0x709e0: @@ -72,22 +72,22 @@ CeladonDeptStore1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $7, $7, 1, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $7, $8, 1, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 0, 14, SIGNPOST_READ, CeladonDeptStore1FDirectory signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton - ; people-events +.PersonEvents: db 3 person_event SPRITE_RECEPTIONIST, 5, 14, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x709e0, -1 person_event SPRITE_GENTLEMAN, 8, 15, OW_DOWN | $2, $11, -1, -1, $0, 0, GentlemanScript_0x709e3, -1 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index 222eb75d4..46954a03e 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -1,8 +1,8 @@ CeladonDeptStore2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x70bad: @@ -66,21 +66,21 @@ CeladonDeptStore2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_3F, MAP_CELADON_DEPT_STORE_3F warp_def $0, $f, 3, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 0, 14, SIGNPOST_READ, CeladonDeptStore2FDirectory signpost 0, 3, SIGNPOST_READ, CeladonDeptStore2FElevatorButton - ; people-events +.PersonEvents: db 4 person_event SPRITE_CLERK, 9, 17, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70bad, -1 person_event SPRITE_CLERK, 9, 18, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70bb5, -1 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index f1cf3ecca..d1db6e1e3 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -1,8 +1,8 @@ CeladonDeptStore3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x70d29: @@ -91,21 +91,21 @@ CeladonDeptStore3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_4F, MAP_CELADON_DEPT_STORE_4F warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 0, 14, SIGNPOST_READ, CeladonDeptStore3FDirectory signpost 0, 3, SIGNPOST_READ, CeladonDeptStore3FElevatorButton - ; people-events +.PersonEvents: db 5 person_event SPRITE_CLERK, 5, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70d29, -1 person_event SPRITE_YOUNGSTER, 8, 10, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x70d31, -1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index a24188086..873942e48 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -1,8 +1,8 @@ CeladonDeptStore4F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x70f0d: @@ -49,21 +49,21 @@ CeladonDeptStore4F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_5F, MAP_CELADON_DEPT_STORE_5F warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_3F, MAP_CELADON_DEPT_STORE_3F warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 0, 14, SIGNPOST_READ, CeladonDeptStore4FDirectory signpost 0, 3, SIGNPOST_READ, CeladonDeptStore4FElevatorButton - ; people-events +.PersonEvents: db 3 person_event SPRITE_CLERK, 9, 17, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70f0d, -1 person_event SPRITE_SUPER_NERD, 10, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x70f15, -1 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 53521d561..e21fc4f39 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -1,8 +1,8 @@ CeladonDeptStore5F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x71004: @@ -68,21 +68,21 @@ CeladonDeptStore5F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_4F, MAP_CELADON_DEPT_STORE_4F warp_def $0, $f, 1, GROUP_CELADON_DEPT_STORE_6F, MAP_CELADON_DEPT_STORE_6F warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 0, 14, SIGNPOST_READ, CeladonDeptStore5FDirectory signpost 0, 3, SIGNPOST_READ, CeladonDeptStore5FElevatorButton - ; people-events +.PersonEvents: db 5 person_event SPRITE_CLERK, 9, 11, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x71004, -1 person_event SPRITE_CLERK, 9, 12, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x7100c, -1 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index d30ad09e2..b708bb1b0 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -1,8 +1,8 @@ CeladonDeptStore6F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -149,15 +149,15 @@ CeladonDeptStore6F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_5F, MAP_CELADON_DEPT_STORE_5F warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 signpost 0, 14, SIGNPOST_READ, CeladonDeptStore6FDirectory signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton @@ -166,7 +166,7 @@ CeladonDeptStore6F_MapEventHeader: signpost 1, 10, SIGNPOST_UP, CeladonVendingMachine signpost 1, 11, SIGNPOST_UP, CeladonVendingMachine - ; people-events +.PersonEvents: db 2 person_event SPRITE_SUPER_NERD, 6, 13, OW_UP | $3, $0, -1, -1, $0, 0, SuperNerdScript_0x7117a, -1 person_event SPRITE_YOUNGSTER, 9, 16, OW_DOWN | $2, $12, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x7117d, -1 diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index 39df686fc..81b696418 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -1,8 +1,8 @@ CeladonDeptStoreElevator_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MapCeladonDeptStoreElevatorSignpost0Script: @@ -33,17 +33,17 @@ CeladonDeptStoreElevator_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $1, 255, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F warp_def $3, $2, 255, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 0, 3, SIGNPOST_READ, MapCeladonDeptStoreElevatorSignpost0Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 339da1118..c117a60e7 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -1,8 +1,8 @@ CeladonGameCorner_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x7211d: @@ -274,15 +274,15 @@ CeladonGameCorner_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $d, $e, 6, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $d, $f, 6, GROUP_CELADON_CITY, MAP_CELADON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 38 signpost 6, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script signpost 7, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script @@ -323,7 +323,7 @@ CeladonGameCorner_MapEventHeader: signpost 0, 15, SIGNPOST_READ, MapCeladonGameCornerSignpost36Script signpost 0, 9, SIGNPOST_READ, MapCeladonGameCornerSignpost37Script - ; people-events +.PersonEvents: db 9 person_event SPRITE_CLERK, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ClerkScript_0x7211d, -1 person_event SPRITE_RECEPTIONIST, 6, 7, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x72120, -1 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index d8899dd7f..adf3b2b61 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -1,8 +1,8 @@ CeladonGameCornerPrizeRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GentlemanScript_0x726e9: @@ -269,20 +269,20 @@ CeladonGameCornerPrizeRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $5, $2, 7, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $5, $3, 7, GROUP_CELADON_CITY, MAP_CELADON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 2, SIGNPOST_READ, MapCeladonGameCornerPrizeRoomSignpost0Script signpost 1, 4, SIGNPOST_READ, MapCeladonGameCornerPrizeRoomSignpost1Script - ; people-events +.PersonEvents: db 2 person_event SPRITE_GENTLEMAN, 6, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x726e9, -1 person_event SPRITE_PHARMACIST, 8, 8, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PharmacistScript_0x726ec, -1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 96933b739..018506a81 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -1,8 +1,8 @@ CeladonGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ErikaScript_0x72a6a: @@ -263,20 +263,20 @@ CeladonGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $11, $4, 8, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $11, $5, 8, GROUP_CELADON_CITY, MAP_CELADON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 15, 3, SIGNPOST_READ, CeladonGymStatue signpost 15, 6, SIGNPOST_READ, CeladonGymStatue - ; people-events +.PersonEvents: db 6 person_event SPRITE_ERIKA, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ErikaScript_0x72a6a, -1 person_event SPRITE_LASS, 12, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerLassMichelle, -1 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 4a717232f..f7d0836d0 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -1,8 +1,8 @@ CeladonMansion1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 CeladonMansionManager: @@ -72,7 +72,7 @@ CeladonMansion1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $9, $6, 2, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $9, $7, 2, GROUP_CELADON_CITY, MAP_CELADON_CITY @@ -80,16 +80,16 @@ CeladonMansion1F_MapEventHeader: warp_def $0, $0, 1, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F warp_def $0, $7, 4, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 8, 5, SIGNPOST_UP, CeladonMansionManagersSuiteSign signpost 3, 0, SIGNPOST_READ, CeladonMansion1fBookshelf signpost 3, 2, SIGNPOST_READ, CeladonMansion1fBookshelf - ; people-events +.PersonEvents: db 4 person_event SPRITE_GRANNY, 9, 5, OW_DOWN | $3, $0, -1, -1, $0, 0, CeladonMansionManager, -1 person_event SPRITE_GROWLITHE, 10, 6, OW_UP | $12, $0, -1, -1, $0, 0, CeladonMansion1FMeowth, -1 diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index 7304996fa..cdbdc9ab3 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -1,8 +1,8 @@ CeladonMansion2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 CeladonMansion2FComputer: @@ -53,21 +53,21 @@ CeladonMansion2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $0, 4, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F warp_def $0, $1, 2, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F warp_def $0, $6, 3, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F warp_def $0, $7, 5, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 3, 0, SIGNPOST_READ, CeladonMansion2FComputer signpost 8, 5, SIGNPOST_UP, CeladonMansion2FSign signpost 3, 2, SIGNPOST_READ, CeladonMansion2FBookshelf - ; people-events +.PersonEvents: db 0 diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 5d1848d38..05064d7cd 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -1,8 +1,8 @@ CeladonMansion3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 CooltrainerMScript_0x71670: @@ -187,24 +187,24 @@ CeladonMansion3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $0, 1, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF warp_def $0, $1, 2, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F warp_def $0, $6, 3, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F warp_def $0, $7, 2, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 signpost 8, 5, SIGNPOST_UP, MapCeladonMansion3FSignpost0Script signpost 3, 4, SIGNPOST_UP, MapCeladonMansion3FSignpost1Script signpost 6, 1, SIGNPOST_UP, MapCeladonMansion3FSignpost2Script signpost 3, 1, SIGNPOST_UP, MapCeladonMansion3FSignpost3Script - ; people-events +.PersonEvents: db 4 person_event SPRITE_COOLTRAINER_M, 10, 7, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x71670, -1 person_event SPRITE_GYM_GUY, 8, 7, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x71696, -1 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 6c236b98a..f3f0952c3 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -1,8 +1,8 @@ CeladonMansionRoof_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FisherScript_0x71a39: @@ -34,19 +34,19 @@ CeladonMansionRoof_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $1, $1, 1, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F warp_def $1, $6, 4, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F warp_def $5, $2, 1, GROUP_CELADON_MANSION_ROOF_HOUSE, MAP_CELADON_MANSION_ROOF_HOUSE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 1, 6, SIGNPOST_LEFT, MapCeladonMansionRoofSignpost0Script - ; people-events +.PersonEvents: db 1 person_event SPRITE_FISHER, 9, 11, OW_UP | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x71a39, -1 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index f8c7f1a91..ff08f5f46 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -1,8 +1,8 @@ CeladonMansionRoofHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PharmacistScript_0x71afd: @@ -117,17 +117,17 @@ CeladonMansionRoofHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF warp_def $7, $3, 3, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_PHARMACIST, 6, 7, OW_UP | $2, $20, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PharmacistScript_0x71afd, -1 diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index 9f8f1a6dc..ea509bc72 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -1,8 +1,8 @@ CeladonPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x71e22: @@ -142,19 +142,19 @@ CeladonPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 5, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $7, $4, 5, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 5 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x71e22, -1 person_event SPRITE_GENTLEMAN, 9, 5, OW_UP | $1, $1, -1, -1, $0, 0, GentlemanScript_0x71e25, -1 diff --git a/maps/CeladonPokeCenter2FBeta.asm b/maps/CeladonPokeCenter2FBeta.asm index 77c3b8b31..94ccc840c 100644 --- a/maps/CeladonPokeCenter2FBeta.asm +++ b/maps/CeladonPokeCenter2FBeta.asm @@ -1,23 +1,23 @@ CeladonPokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 CeladonPokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_CELADON_POKECENTER_1F, MAP_CELADON_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 7175c5a0d..7d78ab042 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -1,8 +1,8 @@ CeruleanCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -273,7 +273,7 @@ CeruleanCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $f, $7, 1, GROUP_CERULEAN_GYM_BADGE_SPEECH_HOUSE, MAP_CERULEAN_GYM_BADGE_SPEECH_HOUSE warp_def $11, $1c, 1, GROUP_CERULEAN_POLICE_STATION, MAP_CERULEAN_POLICE_STATION @@ -282,10 +282,10 @@ CeruleanCity_MapEventHeader: warp_def $17, $1e, 1, GROUP_CERULEAN_GYM, MAP_CERULEAN_GYM warp_def $1d, $19, 2, GROUP_CERULEAN_MART, MAP_CERULEAN_MART - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 9 signpost 23, 23, SIGNPOST_READ, CeruleanCitySign signpost 25, 27, SIGNPOST_READ, CeruleanGymSign @@ -297,7 +297,7 @@ CeruleanCity_MapEventHeader: signpost 29, 26, SIGNPOST_READ, CeruleanCityMartSign signpost 12, 2, SIGNPOST_ITEM, MapCeruleanCitySignpostItem8 - ; people-events +.PersonEvents: db 6 person_event SPRITE_COOLTRAINER_M, 27, 19, OW_DOWN | $2, $22, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CooltrainerMScript_0x184009, -1 person_event SPRITE_SUPER_NERD, 19, 27, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x18401d, -1 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 89ed21f62..e92abbb99 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -1,12 +1,12 @@ CeruleanGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x1883d9, $0000 dw UnknownScript_0x1883da, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x1883d9: @@ -361,21 +361,21 @@ CeruleanGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $f, $4, 5, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY warp_def $f, $5, 5, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 8, 3, SIGNPOST_ITEM, MapCeruleanGymSignpostItem0 signpost 13, 2, SIGNPOST_READ, CeruleanGymStatue1 signpost 13, 6, SIGNPOST_READ, CeruleanGymStatue2 - ; people-events +.PersonEvents: db 6 person_event SPRITE_ROCKET, 14, 8, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET person_event SPRITE_MISTY, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 48b8d9c4b..bef69683b 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -1,8 +1,8 @@ CeruleanGymBadgeSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x188002: @@ -17,17 +17,17 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY warp_def $7, $3, 1, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_POKEFAN_M, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, PokefanMScript_0x188002, -1 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 3fea6f10d..d634b999c 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -1,8 +1,8 @@ CeruleanMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x188ac0: @@ -44,18 +44,18 @@ CeruleanMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 6, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY warp_def $7, $3, 6, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x188ac0, -1 person_event SPRITE_COOLTRAINER_M, 10, 5, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerMScript_0x188ac7, -1 diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokeCenter1F.asm index 6de24f23e..77b9adeae 100644 --- a/maps/CeruleanPokeCenter1F.asm +++ b/maps/CeruleanPokeCenter1F.asm @@ -1,8 +1,8 @@ CeruleanPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x18820f: @@ -61,19 +61,19 @@ CeruleanPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 4, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY warp_def $7, $4, 4, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x18820f, -1 person_event SPRITE_SUPER_NERD, 8, 12, OW_UP | $1, $1, -1, -1, $0, 0, SuperNerdScript_0x188212, -1 diff --git a/maps/CeruleanPokeCenter2FBeta.asm b/maps/CeruleanPokeCenter2FBeta.asm index a738e74e2..6678e73c6 100644 --- a/maps/CeruleanPokeCenter2FBeta.asm +++ b/maps/CeruleanPokeCenter2FBeta.asm @@ -1,23 +1,23 @@ CeruleanPokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 CeruleanPokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 1, GROUP_CERULEAN_POKECENTER_1F, MAP_CERULEAN_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index e97e9d704..d0bdc7999 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -1,8 +1,8 @@ CeruleanPoliceStation_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FishingGuruScript_0x18804a: @@ -42,18 +42,18 @@ CeruleanPoliceStation_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY warp_def $7, $3, 2, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_FISHING_GURU, 5, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FishingGuruScript_0x18804a, -1 person_event SPRITE_POKEFAN_F, 8, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, PokefanFScript_0x18804d, -1 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 7872e8f9b..b0451d91c 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -1,8 +1,8 @@ CeruleanTradeSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GrannyScript_0x188133: @@ -51,18 +51,18 @@ CeruleanTradeSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY warp_def $7, $3, 3, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_GRANNY, 8, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrannyScript_0x188133, -1 person_event SPRITE_GRAMPS, 6, 5, OW_DOWN | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x188136, -1 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index dbbdbfbea..5b9698ca7 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -1,8 +1,8 @@ CharcoalKiln_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 CharcoalKilnBoss: @@ -147,21 +147,21 @@ CharcoalKiln_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $7, $3, 2, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 1, 0, SIGNPOST_READ, CharcoalKilnBookshelf signpost 1, 1, SIGNPOST_READ, CharcoalKilnBookshelf signpost 1, 7, SIGNPOST_READ, CharcoalKilnRadio - ; people-events +.PersonEvents: db 3 person_event SPRITE_BLACK_BELT, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS person_event SPRITE_YOUNGSTER, 7, 9, OW_DOWN | $2, $11, -1, -1, $0, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index d2826e741..bd8168dbc 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -1,12 +1,12 @@ CherrygroveCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -548,7 +548,7 @@ CherrygroveCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $3, $17, 2, GROUP_CHERRYGROVE_MART, MAP_CHERRYGROVE_MART warp_def $3, $1d, 1, GROUP_CHERRYGROVE_POKECENTER_1F, MAP_CHERRYGROVE_POKECENTER_1F @@ -556,19 +556,19 @@ CherrygroveCity_MapEventHeader: warp_def $9, $19, 1, GROUP_GUIDE_GENTS_HOUSE, MAP_GUIDE_GENTS_HOUSE warp_def $b, $1f, 1, GROUP_CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, MAP_CHERRYGROVE_EVOLUTION_SPEECH_HOUSE - ; xy triggers +.XYTriggers: db 2 xy_trigger 1, $6, $21, $0, UnknownScript_0x19c0ae, $0, $0 xy_trigger 1, $7, $21, $0, UnknownScript_0x19c0aa, $0, $0 - ; signposts +.Signposts: db 4 signpost 8, 30, SIGNPOST_READ, CherrygroveCitySign signpost 9, 23, SIGNPOST_READ, GuideGentsHouseSign signpost 3, 24, SIGNPOST_READ, CherrygroveCityMartSign signpost 3, 30, SIGNPOST_READ, CherrygroveCityPokeCenterSign - ; people-events +.PersonEvents: db 5 person_event SPRITE_GRAMPS, 10, 36, OW_UP | $2, $0, -1, -1, $0, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE person_event SPRITE_SILVER, 10, 43, OW_DOWN | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index f3842ba3c..7d7e17f0e 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -1,8 +1,8 @@ CherrygroveEvolutionSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 YoungsterScript_0x196cb2: @@ -41,20 +41,20 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 5, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY warp_def $7, $3, 5, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, CherrygroveEvolutionSpeechHouseBookshelf signpost 1, 1, SIGNPOST_READ, CherrygroveEvolutionSpeechHouseBookshelf - ; people-events +.PersonEvents: db 2 person_event SPRITE_LASS, 9, 7, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x196cb9, -1 person_event SPRITE_YOUNGSTER, 9, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x196cb2, -1 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index ecbad8841..f95fe3396 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -1,8 +1,8 @@ CherrygroveGymSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x196ae1: @@ -44,20 +44,20 @@ CherrygroveGymSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY warp_def $7, $3, 3, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, CherrygroveGymSpeechHouseBookshelf signpost 1, 1, SIGNPOST_READ, CherrygroveGymSpeechHouseBookshelf - ; people-events +.PersonEvents: db 2 person_event SPRITE_POKEFAN_M, 7, 6, OW_UP | $2, $0, -1, -1, $0, 0, PokefanMScript_0x196ae1, -1 person_event SPRITE_BUG_CATCHER, 9, 9, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x196ae4, -1 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index d2bddcc4d..56f613467 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -1,8 +1,8 @@ CherrygroveMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x19680a: @@ -70,18 +70,18 @@ CherrygroveMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY warp_def $7, $3, 1, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x19680a, -1 person_event SPRITE_COOLTRAINER_M, 10, 11, OW_UP | $1, $2, -1, -1, $0, 0, CooltrainerMScript_0x19681d, -1 diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm index 88107854b..4827f1440 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokeCenter1F.asm @@ -1,8 +1,8 @@ CherrygrovePokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x19696d: @@ -66,19 +66,19 @@ CherrygrovePokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 2, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY warp_def $7, $4, 2, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x19696d, -1 person_event SPRITE_FISHER, 7, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x196970, -1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 8715b7392..c54521f0c 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -1,12 +1,12 @@ CianwoodCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -374,7 +374,7 @@ CianwoodCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 7 warp_def $29, $11, 1, GROUP_MANIAS_HOUSE, MAP_MANIAS_HOUSE warp_def $2b, $8, 1, GROUP_CIANWOOD_GYM, MAP_CIANWOOD_GYM @@ -384,11 +384,11 @@ CianwoodCity_MapEventHeader: warp_def $25, $f, 1, GROUP_CIANWOOD_LUGIA_SPEECH_HOUSE, MAP_CIANWOOD_LUGIA_SPEECH_HOUSE warp_def $11, $5, 1, GROUP_POKE_SEERS_HOUSE, MAP_POKE_SEERS_HOUSE - ; xy triggers +.XYTriggers: db 1 xy_trigger 1, $10, $b, $0, UnknownScript_0x1a001e, $0, $0 - ; signposts +.Signposts: db 8 signpost 34, 20, SIGNPOST_READ, CianwoodCitySign signpost 45, 7, SIGNPOST_READ, CianwoodGymSign @@ -399,7 +399,7 @@ CianwoodCity_MapEventHeader: signpost 19, 4, SIGNPOST_ITEM, MapCianwoodCitySignpostItem6 signpost 29, 5, SIGNPOST_ITEM, MapCianwoodCitySignpostItem7 - ; people-events +.PersonEvents: db 12 person_event SPRITE_STANDING_YOUNGSTER, 41, 25, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, StandingYoungsterScript_0x1a00b3, -1 person_event SPRITE_POKEFAN_M, 37, 21, OW_UP | $1, $1, -1, -1, $0, 0, PokefanMScript_0x1a00b6, -1 diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index 9e56eba0a..98dae6883 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -1,8 +1,8 @@ CianwoodCityPhotoStudio_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FishingGuruScript_0x9e0e0: @@ -49,17 +49,17 @@ CianwoodCityPhotoStudio_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 5, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY warp_def $7, $3, 5, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_FISHING_GURU, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FishingGuruScript_0x9e0e0, -1 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 3bd067310..245a550d8 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -1,8 +1,8 @@ CianwoodGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ChuckScript_0x9d60f: @@ -298,20 +298,20 @@ CianwoodGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $11, $4, 2, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY warp_def $11, $5, 2, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 15, 3, SIGNPOST_READ, CianwoodGymStatue signpost 15, 6, SIGNPOST_READ, CianwoodGymStatue - ; people-events +.PersonEvents: db 9 person_event SPRITE_CHUCK, 5, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ChuckScript_0x9d60f, -1 person_event SPRITE_BLACK_BELT, 16, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBlackbeltYoshi, -1 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 85a59778f..c6621f9aa 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -1,8 +1,8 @@ CianwoodLugiaSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x9e1b0: @@ -60,20 +60,20 @@ CianwoodLugiaSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 6, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY warp_def $7, $3, 6, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, CianwoodLugiaSpeechHouseBookshelf signpost 1, 1, SIGNPOST_READ, CianwoodLugiaSpeechHouseBookshelf - ; people-events +.PersonEvents: db 3 person_event SPRITE_TEACHER, 8, 6, OW_UP | $2, $0, -1, -1, $0, 0, TeacherScript_0x9e1b0, -1 person_event SPRITE_LASS, 9, 10, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x9e1b3, -1 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index c74197470..210708780 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -1,11 +1,11 @@ CianwoodPharmacy_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw CianwoodPharmacyTrigger, $0000 - ; callback count +.MapCallbacks: db 0 CianwoodPharmacyTrigger: @@ -75,19 +75,19 @@ CianwoodPharmacy_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY warp_def $7, $3, 4, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, CianwoodPharmacyBookshelf signpost 1, 1, SIGNPOST_READ, CianwoodPharmacyBookshelf - ; people-events +.PersonEvents: db 1 person_event SPRITE_PHARMACIST, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CianwoodPharmacist, -1 diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index d6b3b33db..65d38670c 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -1,8 +1,8 @@ CianwoodPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x9dbcf: @@ -129,19 +129,19 @@ CianwoodPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 3, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY warp_def $7, $4, 3, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x9dbcf, -1 person_event SPRITE_LASS, 9, 5, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x9dbd2, -1 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index fb82346d2..6b5132a8b 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -1,8 +1,8 @@ CinnabarIsland_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -130,20 +130,20 @@ CinnabarIsland_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $b, $b, 1, GROUP_CINNABAR_POKECENTER_1F, MAP_CINNABAR_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 signpost 11, 12, SIGNPOST_READ, CinnabarIslandPokeCenterSign signpost 11, 9, SIGNPOST_READ, CinnabarIslandGymSign signpost 7, 7, SIGNPOST_READ, CinnabarIslandSign signpost 1, 9, SIGNPOST_ITEM, MapCinnabarIslandSignpostItem3 - ; people-events +.PersonEvents: db 1 person_event SPRITE_BLUE, 10, 13, OW_DOWN | $3, $0, -1, -1, $0, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokeCenter1F.asm index feacebd52..1eea0d2f5 100644 --- a/maps/CinnabarPokeCenter1F.asm +++ b/maps/CinnabarPokeCenter1F.asm @@ -1,8 +1,8 @@ CinnabarPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x1ab32c: @@ -33,19 +33,19 @@ CinnabarPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_CINNABAR_ISLAND, MAP_CINNABAR_ISLAND warp_def $7, $4, 1, GROUP_CINNABAR_ISLAND, MAP_CINNABAR_ISLAND warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x1ab32c, -1 person_event SPRITE_COOLTRAINER_F, 10, 11, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x1ab32f, -1 diff --git a/maps/CinnabarPokeCenter2FBeta.asm b/maps/CinnabarPokeCenter2FBeta.asm index d614d2b65..13243c78a 100644 --- a/maps/CinnabarPokeCenter2FBeta.asm +++ b/maps/CinnabarPokeCenter2FBeta.asm @@ -1,23 +1,23 @@ CinnabarPokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 CinnabarPokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_CINNABAR_POKECENTER_1F, MAP_CINNABAR_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index c3a8f50b0..a23704d74 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -1,5 +1,5 @@ Colosseum_MapScriptHeader: - ; trigger count +.MapTriggers: db 3 ; triggers @@ -7,7 +7,7 @@ Colosseum_MapScriptHeader: dw .Trigger2, $0000 dw .Trigger3, $0000 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -68,20 +68,20 @@ Colosseum_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $4, 3, GROUP_POKECENTER_2F, MAP_POKECENTER_2F warp_def $7, $5, 3, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 4, 4, SIGNPOST_RIGHT, MapColosseumSignpost1Script signpost 4, 5, SIGNPOST_LEFT, MapColosseumSignpost1Script - ; people-events +.PersonEvents: db 2 person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index abf29faf6..475d1aa2c 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -1,8 +1,8 @@ CopycatsHouse1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x18ad13: @@ -71,19 +71,19 @@ CopycatsHouse1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $2, 8, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $7, $3, 8, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $0, $2, 1, GROUP_COPYCATS_HOUSE_2F, MAP_COPYCATS_HOUSE_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_POKEFAN_M, 7, 6, OW_UP | $2, $0, -1, -1, $0, 0, PokefanMScript_0x18ad13, -1 person_event SPRITE_POKEFAN_F, 8, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PokefanFScript_0x18ad16, -1 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index fdd621e16..3d71a10ce 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -1,8 +1,8 @@ CopycatsHouse2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -359,19 +359,19 @@ CopycatsHouse2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $0, $3, 3, GROUP_COPYCATS_HOUSE_1F, MAP_COPYCATS_HOUSE_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, CopycatsHouse2FBookshelf signpost 1, 1, SIGNPOST_READ, CopycatsHouse2FBookshelf - ; people-events +.PersonEvents: db 6 person_event SPRITE_COPYCAT, 7, 8, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Copycat, EVENT_COPYCAT_1 person_event SPRITE_MOLTRES, 8, 10, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CopycatsDodrio, -1 diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 67f20f246..af863699e 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -1,8 +1,8 @@ DanceTheatre_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerKimono_girlNaoko2: @@ -330,20 +330,20 @@ DanceTheatre_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $d, $5, 8, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $d, $6, 8, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 6, 5, SIGNPOST_UP, MapDanceTheatreSignpost1Script signpost 6, 6, SIGNPOST_UP, MapDanceTheatreSignpost1Script - ; people-events +.PersonEvents: db 9 person_event SPRITE_KIMONO_GIRL, 6, 4, OW_RIGHT | $12, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerKimono_girlNaoko2, -1 person_event SPRITE_KIMONO_GIRL, 5, 6, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerKimono_girlSayo, -1 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 96fec0ed2..6fcbec599 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -1,8 +1,8 @@ DarkCaveBlackthornEntrance_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PharmacistScript_0x18c720: @@ -60,18 +60,18 @@ DarkCaveBlackthornEntrance_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $17, 1, GROUP_ROUTE_45, MAP_ROUTE_45 warp_def $19, $3, 2, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_PHARMACIST, 7, 11, OW_DOWN | $3, $0, -1, -1, $0, 0, PharmacistScript_0x18c720, -1 person_event SPRITE_POKE_BALL, 28, 25, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c73b, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 37fbfc644..4eeec3c3e 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -1,8 +1,8 @@ DarkCaveVioletEntrance_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18c68e: @@ -28,20 +28,20 @@ DarkCaveVioletEntrance_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $f, $3, 3, GROUP_ROUTE_31, MAP_ROUTE_31 warp_def $1, $11, 2, GROUP_DARK_CAVE_BLACKTHORN_ENTRANCE, MAP_DARK_CAVE_BLACKTHORN_ENTRANCE warp_def $21, $23, 3, GROUP_ROUTE_46, MAP_ROUTE_46 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 3, 26, SIGNPOST_ITEM, MapDarkCaveVioletEntranceSignpostItem0 - ; people-events +.PersonEvents: db 8 person_event SPRITE_POKE_BALL, 12, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c68e, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION person_event SPRITE_ROCK, 18, 20, OW_LEFT | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1 diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 252740764..1f81580f2 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -1,8 +1,8 @@ DayCare_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -158,22 +158,22 @@ DayCare_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $5, $0, 3, GROUP_ROUTE_34, MAP_ROUTE_34 warp_def $6, $0, 4, GROUP_ROUTE_34, MAP_ROUTE_34 warp_def $7, $2, 5, GROUP_ROUTE_34, MAP_ROUTE_34 warp_def $7, $3, 5, GROUP_ROUTE_34, MAP_ROUTE_34 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, DayCareBookshelf signpost 1, 1, SIGNPOST_READ, DayCareBookshelf - ; people-events +.PersonEvents: db 2 person_event SPRITE_GRAMPS, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, GrampsScript_0x62f8f, EVENT_DAYCARE_MAN_IN_DAYCARE person_event SPRITE_GRANNY, 7, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GrannyScript_0x62fc3, -1 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 553fefe24..65e44d06e 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -1,8 +1,8 @@ DiglettsCave_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x74002: @@ -24,7 +24,7 @@ DiglettsCave_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $21, $3, 10, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $1f, $5, 5, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE @@ -33,13 +33,13 @@ DiglettsCave_MapEventHeader: warp_def $21, $11, 2, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE warp_def $3, $3, 4, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 11, 6, SIGNPOST_ITEM, MapDiglettsCaveSignpostItem0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_POKEFAN_M, 35, 7, OW_UP | $2, $0, -1, -1, $0, 0, PokefanMScript_0x74002, -1 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index af1d5ff46..0136c24bc 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -1,12 +1,12 @@ DragonShrine_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 0 .Trigger1: @@ -668,18 +668,18 @@ DragonShrine_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $9, $4, 2, GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F warp_def $9, $5, 2, GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_ELDER, 5, 9, OW_UP | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS person_event SPRITE_ELDER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index 22a4d86f3..de37ae8c8 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -1,26 +1,26 @@ DragonsDen1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 DragonsDen1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $5, $3, 8, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $3, $3, 4, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F warp_def $f, $5, 1, GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F warp_def $d, $5, 2, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index c6359ea0c..5e2f2f71d 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -1,12 +1,12 @@ DragonsDenB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x18c89d, $0000 dw UnknownScript_0x18c89e, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -401,23 +401,23 @@ DragonsDenB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $14, 3, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F warp_def $1d, $13, 1, GROUP_DRAGON_SHRINE, MAP_DRAGON_SHRINE - ; xy triggers +.XYTriggers: db 1 xy_trigger 1, $1e, $13, $0, UnknownScript_0x18c8b8, $0, $0 - ; signposts +.Signposts: db 4 signpost 24, 18, SIGNPOST_READ, MapDragonsDenB1FSignpost0Script signpost 29, 33, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem1 signpost 17, 21, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem2 signpost 15, 31, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem3 - ; people-events +.PersonEvents: db 9 person_event SPRITE_POKE_BALL, 20, 39, OW_DOWN | $1, $0, -1, -1, $0, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG person_event SPRITE_CLAIR, 34, 18, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 39d4ab0b7..f91725c5e 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -1,8 +1,8 @@ EarlsPokemonAcademy_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 AcademyEarl: @@ -408,22 +408,22 @@ EarlsPokemonAcademy_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $f, $3, 3, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $f, $4, 3, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 signpost 1, 0, SIGNPOST_READ, AcademyBookshelf signpost 1, 1, SIGNPOST_READ, AcademyBookshelf signpost 0, 3, SIGNPOST_READ, AcademyBlackboard signpost 0, 4, SIGNPOST_READ, AcademyBlackboard - ; people-events +.PersonEvents: db 6 person_event SPRITE_FISHER, 6, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL person_event SPRITE_YOUNGSTER, 9, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x68a83, -1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index e4f748c28..542b23c7b 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -1,8 +1,8 @@ EcruteakCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -256,7 +256,7 @@ EcruteakCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 15 warp_def $1a, $23, 1, GROUP_ROUTE_42_ECRUTEAK_GATE, MAP_ROUTE_42_ECRUTEAK_GATE warp_def $1b, $23, 2, GROUP_ROUTE_42_ECRUTEAK_GATE, MAP_ROUTE_42_ECRUTEAK_GATE @@ -274,10 +274,10 @@ EcruteakCity_MapEventHeader: warp_def $12, $0, 3, GROUP_ROUTE_38_ECRUTEAK_GATE, MAP_ROUTE_38_ECRUTEAK_GATE warp_def $13, $0, 4, GROUP_ROUTE_38_ECRUTEAK_GATE, MAP_ROUTE_38_ECRUTEAK_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 8 signpost 21, 15, SIGNPOST_READ, EcruteakCitySign signpost 10, 38, SIGNPOST_READ, TinTowerSign @@ -288,7 +288,7 @@ EcruteakCity_MapEventHeader: signpost 21, 30, SIGNPOST_READ, EcruteakCityMartSign signpost 14, 23, SIGNPOST_ITEM, MapEcruteakCitySignpostItem7 - ; people-events +.PersonEvents: db 7 person_event SPRITE_GRAMPS, 19, 22, OW_DOWN | $2, $11, -1, -1, $0, 0, GrampsScript_0x1a4009, -1 person_event SPRITE_GRAMPS, 25, 24, OW_DOWN | $3, $0, -1, -1, $0, 0, GrampsScript_0x1a400c, -1 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 5da93822e..f6c46f587 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -1,12 +1,12 @@ EcruteakGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x99d53, $0000 dw UnknownScript_0x99d57, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x99d53: @@ -383,7 +383,7 @@ EcruteakGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 33 warp_def $11, $4, 10, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $11, $5, 10, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY @@ -419,15 +419,15 @@ EcruteakGym_MapEventHeader: warp_def $c, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM warp_def $d, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 15, 3, SIGNPOST_READ, EcruteakGymStatue signpost 15, 6, SIGNPOST_READ, EcruteakGymStatue - ; people-events +.PersonEvents: db 7 person_event SPRITE_MORTY, 5, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MortyScript_0x99d58, -1 person_event SPRITE_SAGE, 11, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSageJeffrey, -1 diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 811e4a0d2..314394cf7 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -1,12 +1,12 @@ EcruteakHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -280,7 +280,7 @@ EcruteakHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $11, $4, 3, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $11, $5, 3, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY @@ -288,15 +288,15 @@ EcruteakHouse_MapEventHeader: warp_def $f, $11, 3, GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE warp_def $3, $11, 3, GROUP_WISE_TRIOS_ROOM, MAP_WISE_TRIOS_ROOM - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $7, $4, $0, EcruteakHouse_XYTrigger1, $0, $0 xy_trigger 0, $7, $5, $0, EcruteakHouse_XYTrigger2, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_SAGE, 10, 8, OW_UP | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 person_event SPRITE_SAGE, 10, 9, OW_UP | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 340e7f6c5..358abdf13 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -1,8 +1,8 @@ EcruteakItemfinderHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 CooltrainerMScript_0x9a5fb: @@ -162,19 +162,19 @@ EcruteakItemfinderHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $3, 11, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $7, $4, 11, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 1, 2, SIGNPOST_READ, ItemFinderHouseRadio - ; people-events +.PersonEvents: db 2 person_event SPRITE_COOLTRAINER_M, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x9a5fb, -1 person_event SPRITE_POKEDEX, 7, 7, OW_DOWN | $1, $0, -1, -1, $0, 0, PokedexScript_0x9a620, -1 diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index f39811a85..be6623449 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -1,8 +1,8 @@ EcruteakLugiaSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GrampsScript_0x99334: @@ -44,19 +44,19 @@ EcruteakLugiaSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $3, 7, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $7, $4, 7, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 1, 2, SIGNPOST_READ, LugiaSpeechHouseRadio - ; people-events +.PersonEvents: db 2 person_event SPRITE_GRAMPS, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, GrampsScript_0x99334, -1 person_event SPRITE_YOUNGSTER, 8, 9, OW_LEFT | $0, $0, -1, -1, $0, 0, YoungsterScript_0x99337, -1 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 65b61c3d0..63fd8ed48 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -1,8 +1,8 @@ EcruteakMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x99c3b: @@ -44,18 +44,18 @@ EcruteakMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 9, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $7, $3, 9, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x99c3b, -1 person_event SPRITE_SUPER_NERD, 6, 9, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x99c42, -1 diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index 907811357..68057be2c 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -1,12 +1,12 @@ EcruteakPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x98e5f, $0000 dw UnknownScript_0x98e63, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x98e5f: @@ -205,19 +205,19 @@ EcruteakPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 6, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $7, $4, 6, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 5 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x98eb0, -1 person_event SPRITE_POKEFAN_M, 10, 11, OW_LEFT | $2, $0, -1, -1, $0, 0, PokefanMScript_0x98eb3, -1 diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 5ad69ce63..ff0c971a7 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -1,8 +1,8 @@ ElmsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ElmsWife: @@ -83,21 +83,21 @@ ElmsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN warp_def $7, $3, 4, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 1, 0, SIGNPOST_READ, ElmsHousePC signpost 1, 6, SIGNPOST_READ, ElmsHouseBookshelf signpost 1, 7, SIGNPOST_READ, ElmsHouseBookshelf - ; people-events +.PersonEvents: db 2 person_event SPRITE_TEACHER, 9, 5, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ElmsWife, -1 person_event SPRITE_BUG_CATCHER, 8, 9, OW_UP | $3, $0, -1, -1, $0, 0, ElmsSon, -1 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 38da97755..d6c242e4a 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1,5 +1,5 @@ ElmsLab_MapScriptHeader: - ; trigger count +.MapTriggers: db 6 ; triggers @@ -10,7 +10,7 @@ ElmsLab_MapScriptHeader: dw UnknownScript_0x78b81, $0000 dw UnknownScript_0x78b82, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -1371,12 +1371,12 @@ ElmsLab_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $b, $4, 1, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN warp_def $b, $5, 1, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN - ; xy triggers +.XYTriggers: db 8 xy_trigger 1, $6, $4, $0, LabTryToLeaveScript, $0, $0 xy_trigger 1, $6, $5, $0, LabTryToLeaveScript, $0, $0 @@ -1387,7 +1387,7 @@ ElmsLab_MapEventHeader: xy_trigger 6, $8, $4, $0, AideScript_WalkBalls1, $0, $0 xy_trigger 6, $8, $5, $0, AideScript_WalkBalls2, $0, $0 - ; signposts +.Signposts: db 16 signpost 1, 2, SIGNPOST_READ, ElmsLabHealingMachine signpost 1, 6, SIGNPOST_READ, ElmsLabBookshelf @@ -1406,7 +1406,7 @@ ElmsLab_MapEventHeader: signpost 0, 5, SIGNPOST_READ, ElmsLabWindow signpost 5, 3, SIGNPOST_DOWN, ElmsLabPC - ; people-events +.PersonEvents: db 6 person_event SPRITE_ELM, 6, 9, OW_UP | $2, $0, -1, -1, $0, 0, ProfElmScript, -1 person_event SPRITE_SCIENTIST, 13, 6, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 79cb1e35f..16ff3d059 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -1,5 +1,5 @@ FastShip1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 3 ; triggers @@ -7,7 +7,7 @@ FastShip1F_MapScriptHeader: dw .Trigger2, $0000 dw .Trigger3, $0000 - ; callback count +.MapCallbacks: db 0 .Trigger1: @@ -285,7 +285,7 @@ FastShip1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 12 warp_def $1, $19, 255, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F warp_def $8, $1b, 1, GROUP_FAST_SHIP_CABINS_NNW_NNE_NE, MAP_FAST_SHIP_CABINS_NNW_NNE_NE @@ -300,15 +300,15 @@ FastShip1F_MapEventHeader: warp_def $c, $6, 1, GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F warp_def $e, $1e, 2, GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F - ; xy triggers +.XYTriggers: db 2 xy_trigger 2, $6, $18, $0, UnknownScript_0x751eb, $0, $0 xy_trigger 2, $6, $19, $0, UnknownScript_0x751e7, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_SAILOR, 6, 29, OW_UP | $2, $0, -1, -1, $0, 0, SailorScript_0x75160, -1 person_event SPRITE_SAILOR, 11, 18, OW_LEFT | $1, $0, -1, -1, $0, 0, SailorScript_0x751d0, -1 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 859fc5e3d..9c821933a 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -1,12 +1,12 @@ FastShipB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x7673a, $0000 dw UnknownScript_0x7673b, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x7673a: @@ -440,21 +440,21 @@ FastShipB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $b, $5, 11, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F warp_def $d, $1f, 12, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $7, $1e, $0, UnknownScript_0x7673c, $0, $0 xy_trigger 0, $7, $1f, $0, UnknownScript_0x76751, $0, $0 - ; signposts +.Signposts: db 1 signpost 9, 27, SIGNPOST_READ, FashShipB1FTrashcan - ; people-events +.PersonEvents: db 12 person_event SPRITE_SAILOR, 10, 34, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT person_event SPRITE_SAILOR, 10, 35, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index c580b69ce..979ede647 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -1,8 +1,8 @@ FastShipCabins_NNW_NNE_NE_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerCooltrainermSean: @@ -261,22 +261,22 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $2, 2, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F warp_def $c, $2, 3, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F warp_def $18, $2, 4, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 13, 6, SIGNPOST_READ, FastShipCabins_NNW_NNE_NETrashcan signpost 19, 7, SIGNPOST_READ, FastShipCabins_NNW_NNE_NETrashcan signpost 31, 7, SIGNPOST_READ, FastShipCabins_NNW_NNE_NETrashcan - ; people-events +.PersonEvents: db 7 person_event SPRITE_COOLTRAINER_M, 7, 8, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND person_event SPRITE_COOLTRAINER_F, 9, 5, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 112c6224d..5376c64cd 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -1,8 +1,8 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x75ea6: @@ -453,7 +453,7 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $7, $2, 8, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F warp_def $7, $3, 8, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F @@ -462,14 +462,14 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: warp_def $21, $2, 10, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F warp_def $21, $3, 10, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 25, 4, SIGNPOST_READ, FastShipCaptainsCabinTrashcan - ; people-events +.PersonEvents: db 11 person_event SPRITE_CAPTAIN, 29, 7, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CaptainScript_0x75ea7, -1 person_event SPRITE_GENTLEMAN, 21, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x75f1f, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 1f4fafcf4..5b62f4b09 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -1,8 +1,8 @@ FastShipCabins_SW_SSW_NW_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerFirebreatherLyle: @@ -220,7 +220,7 @@ FastShipCabins_SW_SSW_NW_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $0, $2, 5, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F warp_def $13, $2, 6, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F @@ -228,16 +228,16 @@ FastShipCabins_SW_SSW_NW_MapEventHeader: warp_def $1f, $2, 7, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F warp_def $1f, $3, 7, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 1, 7, SIGNPOST_READ, FastShipBed signpost 2, 7, SIGNPOST_READ, FastShipBed signpost 7, 7, SIGNPOST_READ, FastShipCabinsNorthwestCabinTrashcan - ; people-events +.PersonEvents: db 4 person_event SPRITE_FISHER, 19, 5, OW_RIGHT | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP person_event SPRITE_BUG_CATCHER, 19, 10, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 8e5ef17c1..ce0515e79 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -1,8 +1,8 @@ FightingDojo_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 BlackBeltScript_0x189b61: @@ -42,20 +42,20 @@ FightingDojo_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $b, $4, 1, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $b, $5, 1, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 0, 4, SIGNPOST_READ, MapFightingDojoSignpost0Script signpost 0, 5, SIGNPOST_READ, MapFightingDojoSignpost1Script - ; people-events +.PersonEvents: db 2 person_event SPRITE_BLACK_BELT, 8, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x189b61, -1 person_event SPRITE_POKE_BALL, 5, 7, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index 410914a95..ae31a356e 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -1,8 +1,8 @@ FuchsiaBillSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanFScript_0x1963bd: @@ -27,18 +27,18 @@ FuchsiaBillSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $7, $3, 4, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_POKEFAN_F, 7, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanFScript_0x1963bd, -1 person_event SPRITE_YOUNGSTER, 8, 10, OW_UP | $0, $10, -1, -1, $0, 0, YoungsterScript_0x1963c0, -1 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index c492a37d9..7dcb20190 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -1,8 +1,8 @@ FuchsiaCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -124,7 +124,7 @@ FuchsiaCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 11 warp_def $d, $5, 2, GROUP_FUCHSIA_MART, MAP_FUCHSIA_MART warp_def $d, $16, 1, GROUP_SAFARI_ZONE_MAIN_OFFICE, MAP_SAFARI_ZONE_MAIN_OFFICE @@ -138,10 +138,10 @@ FuchsiaCity_MapEventHeader: warp_def $23, $7, 1, GROUP_ROUTE_19___FUCHSIA_GATE, MAP_ROUTE_19___FUCHSIA_GATE warp_def $23, $8, 2, GROUP_ROUTE_19___FUCHSIA_GATE, MAP_ROUTE_19___FUCHSIA_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 8 signpost 15, 21, SIGNPOST_READ, FuchsiaCitySign signpost 29, 5, SIGNPOST_READ, FuchsiaGymSign @@ -152,7 +152,7 @@ FuchsiaCity_MapEventHeader: signpost 27, 20, SIGNPOST_READ, FuchsiaCityPokeCenterSign signpost 13, 6, SIGNPOST_READ, FuchsiaCityMartSign - ; people-events +.PersonEvents: db 4 person_event SPRITE_YOUNGSTER, 22, 27, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x194b22, -1 person_event SPRITE_POKEFAN_M, 12, 17, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x194b25, -1 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 52ed08a83..16363b003 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -1,8 +1,8 @@ FuchsiaGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 JanineScript_0x195db9: @@ -376,20 +376,20 @@ FuchsiaGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $11, $4, 3, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $11, $5, 3, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 15, 3, SIGNPOST_READ, FuchsiaGymStatue signpost 15, 6, SIGNPOST_READ, FuchsiaGymStatue - ; people-events +.PersonEvents: db 6 person_event SPRITE_JANINE, 14, 5, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, JanineScript_0x195db9, -1 person_event SPRITE_FUCHSIA_GYM_1, 11, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FuschiaGym1Script_0x195e1b, -1 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 249973704..6102bcb35 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -1,8 +1,8 @@ FuchsiaMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x195ce8: @@ -36,18 +36,18 @@ FuchsiaMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $7, $3, 1, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x195ce8, -1 person_event SPRITE_FISHER, 6, 7, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x195cef, -1 diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index cd36c2b9f..4dda55a23 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -1,11 +1,11 @@ FuchsiaPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x196458, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x196458: @@ -88,19 +88,19 @@ FuchsiaPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 5, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $7, $4, 5, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, NurseScript_0x196459, -1 person_event SPRITE_COOLTRAINER_M, 8, 12, OW_UP | $1, $1, -1, -1, $0, 0, CooltrainerMScript_0x19645c, -1 diff --git a/maps/FuchsiaPokeCenter2FBeta.asm b/maps/FuchsiaPokeCenter2FBeta.asm index 20649cd68..20ab0c4b7 100644 --- a/maps/FuchsiaPokeCenter2FBeta.asm +++ b/maps/FuchsiaPokeCenter2FBeta.asm @@ -1,23 +1,23 @@ FuchsiaPokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FuchsiaPokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_FUCHSIA_POKECENTER_1F, MAP_FUCHSIA_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 5147a3d9f..909b07788 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -1,8 +1,8 @@ GoldenrodBikeShop_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x5474f: @@ -103,15 +103,15 @@ GoldenrodBikeShop_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $3, 2, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 9 signpost 2, 1, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script signpost 3, 0, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script @@ -123,6 +123,6 @@ GoldenrodBikeShop_MapEventHeader: signpost 6, 6, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script signpost 6, 7, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script - ; people-events +.PersonEvents: db 1 person_event SPRITE_CLERK, 6, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ClerkScript_0x54750, -1 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index b6953d3cb..d442cf482 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -1,8 +1,8 @@ GoldenrodBillsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 BillsHouseBill: @@ -241,21 +241,21 @@ GoldenrodBillsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $3, 4, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 1, 0, SIGNPOST_READ, BillsHouseBookshelf2 signpost 1, 1, SIGNPOST_READ, BillsHouseBookshelf1 signpost 1, 7, SIGNPOST_READ, BillsHouseRadio - ; people-events +.PersonEvents: db 3 person_event SPRITE_BILL, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, BillsHouseBill, EVENT_MET_BILL person_event SPRITE_POKEFAN_F, 7, 9, OW_UP | $2, $0, -1, -1, $0, 0, BillsMom, -1 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 0b6282e10..20c70eb0e 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -1,8 +1,8 @@ GoldenrodCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -543,7 +543,7 @@ GoldenrodCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 15 warp_def $7, $18, 1, GROUP_GOLDENROD_GYM, MAP_GOLDENROD_GYM warp_def $1d, $1d, 1, GROUP_GOLDENROD_BIKE_SHOP, MAP_GOLDENROD_BIKE_SHOP @@ -561,10 +561,10 @@ GoldenrodCity_MapEventHeader: warp_def $1d, $b, 5, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES warp_def $1b, $f, 1, GROUP_GOLDENROD_POKECENTER_1F, MAP_GOLDENROD_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 12 signpost 14, 10, SIGNPOST_READ, GoldenrodCityStationSign signpost 17, 4, SIGNPOST_READ, GoldenrodCityRadioTowerSign @@ -579,7 +579,7 @@ GoldenrodCity_MapEventHeader: signpost 27, 16, SIGNPOST_UP, GoldenrodCityPokeCenterSign signpost 6, 30, SIGNPOST_READ, GoldenrodCityFlowerShopSign - ; people-events +.PersonEvents: db 15 person_event SPRITE_POKEFAN_M, 22, 11, OW_UP | $3, $0, -1, -1, $0, 0, PokefanMScript_0x1989e3, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_YOUNGSTER, 21, 34, OW_DOWN | $2, $11, -1, -1, $0, 0, YoungsterScript_0x1989e6, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index ff0a45250..06a9f823e 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -1,8 +1,8 @@ GoldenrodDeptStore1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ReceptionistScript_0x55981: @@ -76,22 +76,22 @@ GoldenrodDeptStore1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $7, $7, 9, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $8, 9, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $0, $f, 2, GROUP_GOLDENROD_DEPT_STORE_2F, MAP_GOLDENROD_DEPT_STORE_2F warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore1FDirectory signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore1FElevatorButton - ; people-events +.PersonEvents: db 4 person_event SPRITE_RECEPTIONIST, 5, 14, OW_UP | $2, $0, -1, -1, $0, 0, ReceptionistScript_0x55981, -1 person_event SPRITE_POKEFAN_F, 8, 9, OW_UP | $2, $0, -1, -1, $0, 0, PokefanFScript_0x55987, -1 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index ceaf855bf..be84a789f 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -1,8 +1,8 @@ GoldenrodDeptStore2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x55b5d: @@ -97,21 +97,21 @@ GoldenrodDeptStore2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $c, 1, GROUP_GOLDENROD_DEPT_STORE_3F, MAP_GOLDENROD_DEPT_STORE_3F warp_def $0, $f, 3, GROUP_GOLDENROD_DEPT_STORE_1F, MAP_GOLDENROD_DEPT_STORE_1F warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore2FDirectory signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore2FElevatorButton - ; people-events +.PersonEvents: db 5 person_event SPRITE_CLERK, 9, 17, OW_UP | $3, $0, -1, -1, $0, 0, ClerkScript_0x55b5d, -1 person_event SPRITE_CLERK, 10, 17, OW_LEFT | $0, $0, -1, -1, $0, 0, ClerkScript_0x55b65, -1 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 6ac986dfd..b21371879 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -1,8 +1,8 @@ GoldenrodDeptStore3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x55db8: @@ -55,21 +55,21 @@ GoldenrodDeptStore3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $c, 1, GROUP_GOLDENROD_DEPT_STORE_2F, MAP_GOLDENROD_DEPT_STORE_2F warp_def $0, $f, 2, GROUP_GOLDENROD_DEPT_STORE_4F, MAP_GOLDENROD_DEPT_STORE_4F warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore3FDirectory signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore3FElevatorButton - ; people-events +.PersonEvents: db 3 person_event SPRITE_CLERK, 5, 10, OW_UP | $2, $0, -1, -1, $0, 0, ClerkScript_0x55db8, -1 person_event SPRITE_SUPER_NERD, 9, 16, OW_LEFT | $2, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x55dc0, -1 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 886e9aa58..0606fa4bd 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -1,8 +1,8 @@ GoldenrodDeptStore4F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x55ee9: @@ -75,21 +75,21 @@ GoldenrodDeptStore4F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $c, 1, GROUP_GOLDENROD_DEPT_STORE_5F, MAP_GOLDENROD_DEPT_STORE_5F warp_def $0, $f, 2, GROUP_GOLDENROD_DEPT_STORE_3F, MAP_GOLDENROD_DEPT_STORE_3F warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore4FDirectory signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore4FElevatorButton - ; people-events +.PersonEvents: db 4 person_event SPRITE_CLERK, 9, 17, OW_UP | $3, $0, -1, -1, $0, 0, ClerkScript_0x55ee9, -1 person_event SPRITE_COOLTRAINER_M, 11, 15, OW_LEFT | $1, $0, -1, -1, $0, 0, CooltrainerMScript_0x55ef1, -1 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 914785ee6..834b82614 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -1,8 +1,8 @@ GoldenrodDeptStore5F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -216,21 +216,21 @@ GoldenrodDeptStore5F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $c, 1, GROUP_GOLDENROD_DEPT_STORE_4F, MAP_GOLDENROD_DEPT_STORE_4F warp_def $0, $f, 1, GROUP_GOLDENROD_DEPT_STORE_6F, MAP_GOLDENROD_DEPT_STORE_6F warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore5FDirectory signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore5FElevatorButton - ; people-events +.PersonEvents: db 6 person_event SPRITE_CLERK, 9, 12, OW_UP | $3, $0, -1, -1, $0, 0, ClerkScript_0x5609c, -1 person_event SPRITE_LASS, 10, 7, OW_DOWN | $2, $11, -1, -1, $0, 0, LassScript_0x56130, -1 diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index f9a905758..588746745 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -1,8 +1,8 @@ GoldenrodDeptStore6F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GoldenrodVendingMachine: @@ -149,16 +149,16 @@ GoldenrodDeptStore6F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $f, 2, GROUP_GOLDENROD_DEPT_STORE_5F, MAP_GOLDENROD_DEPT_STORE_5F warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR warp_def $0, $d, 1, GROUP_GOLDENROD_DEPT_STORE_ROOF, MAP_GOLDENROD_DEPT_STORE_ROOF - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore6FDirectory signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore6FElevatorButton @@ -167,7 +167,7 @@ GoldenrodDeptStore6F_MapEventHeader: signpost 1, 10, SIGNPOST_UP, GoldenrodVendingMachine signpost 1, 11, SIGNPOST_UP, GoldenrodVendingMachine - ; people-events +.PersonEvents: db 2 person_event SPRITE_LASS, 6, 14, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x564bf, -1 person_event SPRITE_SUPER_NERD, 6, 12, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x564c2, -1 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index be6245e21..d80feb513 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -1,8 +1,8 @@ GoldenrodDeptStoreB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -107,19 +107,19 @@ GoldenrodDeptStoreB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $2, $11, 3, GROUP_UNDERGROUND_WAREHOUSE, MAP_UNDERGROUND_WAREHOUSE warp_def $4, $9, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR warp_def $4, $a, 2, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 8 person_event SPRITE_POKE_BALL, 19, 14, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c3, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER person_event SPRITE_POKE_BALL, 6, 18, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c5, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index bb4750472..8a7b85375 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -1,8 +1,8 @@ GoldenrodDeptStoreElevator_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MapGoldenrodDeptStoreElevatorSignpost0Script: @@ -60,17 +60,17 @@ GoldenrodDeptStoreElevator_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $1, 255, GROUP_GOLDENROD_DEPT_STORE_1F, MAP_GOLDENROD_DEPT_STORE_1F warp_def $3, $2, 255, GROUP_GOLDENROD_DEPT_STORE_1F, MAP_GOLDENROD_DEPT_STORE_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 0, 3, SIGNPOST_READ, MapGoldenrodDeptStoreElevatorSignpost0Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 7bcac0d5c..ba80f2773 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -1,8 +1,8 @@ GoldenrodDeptStoreRoof_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -209,21 +209,21 @@ GoldenrodDeptStoreRoof_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $1, $d, 3, GROUP_GOLDENROD_DEPT_STORE_6F, MAP_GOLDENROD_DEPT_STORE_6F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 signpost 3, 15, SIGNPOST_RIGHT, MapGoldenrodDeptStoreRoofSignpost0Script signpost 5, 15, SIGNPOST_RIGHT, MapGoldenrodDeptStoreRoofSignpost1Script signpost 6, 15, SIGNPOST_RIGHT, MapGoldenrodDeptStoreRoofSignpost2Script signpost 0, 3, SIGNPOST_UP, MapGoldenrodDeptStoreRoofSignpost3Script - ; people-events +.PersonEvents: db 8 person_event SPRITE_CLERK, 8, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF person_event SPRITE_POKEFAN_F, 7, 14, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanFScript_0x56746, -1 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 3ddfbff0c..08f6dc3c9 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -1,8 +1,8 @@ GoldenrodFlowerShop_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x5535d: @@ -159,18 +159,18 @@ GoldenrodFlowerShop_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 6, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $3, 6, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_TEACHER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, TeacherScript_0x5535d, -1 person_event SPRITE_LASS, 10, 9, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x553a2, EVENT_FLORIA_AT_FLOWER_SHOP diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 09596d0a6..898b292d5 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -1,8 +1,8 @@ GoldenrodGameCorner_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -435,15 +435,15 @@ GoldenrodGameCorner_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $d, $2, 10, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $d, $3, 10, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 31 signpost 6, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script signpost 7, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script @@ -477,7 +477,7 @@ GoldenrodGameCorner_MapEventHeader: signpost 11, 18, SIGNPOST_RIGHT, MapGoldenrodGameCornerSignpost29Script signpost 1, 12, SIGNPOST_LEFT, MapGoldenrodGameCornerSignpost30Script - ; people-events +.PersonEvents: db 12 person_event SPRITE_CLERK, 6, 7, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ClerkScript_0x56c25, -1 person_event SPRITE_RECEPTIONIST, 6, 20, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x56c28, -1 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 9d9a62bcd..3504c3f4a 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -1,12 +1,12 @@ GoldenrodGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x5400a, $0000 dw UnknownScript_0x5400b, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x5400a: @@ -377,21 +377,21 @@ GoldenrodGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $11, $2, 1, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $11, $3, 1, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 1 xy_trigger 1, $5, $8, $0, WhitneyCriesScript, $0, $0 - ; signposts +.Signposts: db 2 signpost 15, 1, SIGNPOST_READ, GoldenrodGymStatue signpost 15, 4, SIGNPOST_READ, GoldenrodGymStatue - ; people-events +.PersonEvents: db 6 person_event SPRITE_WHITNEY, 7, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, WhitneyScript_0x5400c, -1 person_event SPRITE_LASS, 17, 13, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerLassCarrie, -1 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index d5b93b6c7..74bcf5b51 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -1,8 +1,8 @@ GoldenrodHappinessRater_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x54953: @@ -135,21 +135,21 @@ GoldenrodHappinessRater_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $3, 3, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 1, 0, SIGNPOST_READ, HappinessRatersHouseBookshelf signpost 1, 1, SIGNPOST_READ, HappinessRatersHouseBookshelf signpost 1, 7, SIGNPOST_READ, HappinessRatersHouseRadio - ; people-events +.PersonEvents: db 3 person_event SPRITE_TEACHER, 8, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x54953, -1 person_event SPRITE_POKEFAN_M, 7, 9, OW_LEFT | $0, $0, -1, -1, $0, 0, PokefanMScript_0x54997, -1 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 04796814e..339bc55ee 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -1,11 +1,11 @@ GoldenrodMagnetTrainStation_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x550eb, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x550eb: @@ -166,21 +166,21 @@ GoldenrodMagnetTrainStation_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $11, $8, 5, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $11, $9, 5, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $5, $6, 4, GROUP_SAFFRON_TRAIN_STATION, MAP_SAFFRON_TRAIN_STATION warp_def $5, $b, 3, GROUP_SAFFRON_TRAIN_STATION, MAP_SAFFRON_TRAIN_STATION - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $6, $b, $0, UnknownScript_0x55130, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_OFFICER, 13, 13, OW_UP | $2, $0, -1, -1, $0, 0, OfficerScript_0x550ec, -1 person_event SPRITE_GENTLEMAN, 18, 15, OW_DOWN | $2, $22, -1, -1, $0, 0, GentlemanScript_0x55143, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN diff --git a/maps/GoldenrodNameRatersHouse.asm b/maps/GoldenrodNameRatersHouse.asm index cb7509a2e..587e052d2 100644 --- a/maps/GoldenrodNameRatersHouse.asm +++ b/maps/GoldenrodNameRatersHouse.asm @@ -1,8 +1,8 @@ GoldenrodNameRatersHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GentlemanScript_0x5577c: @@ -25,20 +25,20 @@ GoldenrodNameRatersHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 8, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $3, 8, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 1, 0, SIGNPOST_READ, GoldenrodNameRatersHouseBookshelf signpost 1, 1, SIGNPOST_READ, GoldenrodNameRatersHouseBookshelf signpost 1, 7, SIGNPOST_READ, GoldenrodNameRatersHouseRadio - ; people-events +.PersonEvents: db 1 person_event SPRITE_GENTLEMAN, 8, 6, OW_UP | $2, $2, -1, -1, $0, 0, GentlemanScript_0x5577c, -1 diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 200c1a1e6..d41659542 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -1,8 +1,8 @@ GoldenrodPPSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FisherScript_0x5564a: @@ -51,21 +51,21 @@ GoldenrodPPSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 7, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $3, 7, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 1, 0, SIGNPOST_READ, GoldenrodPPSpeechHouseBookshelf1 signpost 1, 1, SIGNPOST_READ, GoldenrodPPSpeechHouseBookshelf2 signpost 1, 7, SIGNPOST_READ, GoldenrodPPSpeechHouseRadio - ; people-events +.PersonEvents: db 2 person_event SPRITE_FISHER, 8, 6, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x5564a, -1 person_event SPRITE_LASS, 7, 9, OW_LEFT | $0, $10, -1, -1, $0, 0, LassScript_0x5564d, -1 diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index ca0c571c7..c74f59265 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -1,8 +1,8 @@ GoldenrodPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x60f91: @@ -801,22 +801,22 @@ GoldenrodPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $7, $3, 15, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $4, 15, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $6, $0, 1, GROUP_GOLDENROD_POKECOM_CENTER_2F_MOBILE, MAP_GOLDENROD_POKECOM_CENTER_2F_MOBILE warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $7, $3, $0, UnknownScript_0x60f94, $0, $0 xy_trigger 0, $7, $4, $0, UnknownScript_0x60fd9, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 5 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x60f91, -1 person_event SPRITE_LINK_RECEPTIONIST, 12, 20, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, -1 diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 176be5390..44da9ca7b 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -1,8 +1,8 @@ GoldenrodPokeComCenter2FMobile_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ScientistScript_0x625d1: @@ -267,21 +267,21 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $1f, $0, 3, GROUP_GOLDENROD_POKECENTER_1F, MAP_GOLDENROD_POKECENTER_1F warp_def $1f, $1, 3, GROUP_GOLDENROD_POKECENTER_1F, MAP_GOLDENROD_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 26, 6, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost0Script signpost 28, 6, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost1Script signpost 26, 3, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost2Script - ; people-events +.PersonEvents: db 3 person_event SPRITE_SCIENTIST, 32, 8, OW_UP | $0, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, ScientistScript_0x625d1, -1 person_event SPRITE_SCIENTIST, 31, 11, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x625d4, -1 diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index ff184f647..cf35df9ba 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -1,8 +1,8 @@ GuideGentsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GuideGentsHouseGuideGent: @@ -28,19 +28,19 @@ GuideGentsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY warp_def $7, $3, 4, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, GuideGentsHouseBookshelf signpost 1, 1, SIGNPOST_READ, GuideGentsHouseBookshelf - ; people-events +.PersonEvents: db 1 person_event SPRITE_GRAMPS, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index cd05128c2..91595fa04 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -1,12 +1,12 @@ HallOfFame_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 0 .Trigger1: @@ -113,17 +113,17 @@ HallOfFame_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $d, $4, 3, GROUP_LANCES_ROOM, MAP_LANCES_ROOM warp_def $d, $5, 4, GROUP_LANCES_ROOM, MAP_LANCES_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_LANCE, 16, 8, OW_UP | $3, $0, -1, -1, PAL_OW_RED << 4 | $0, 0, ObjectEvent, -1 diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index 32ca4960c..c233edeba 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -1,8 +1,8 @@ IcePath1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x7e472: @@ -18,20 +18,20 @@ IcePath1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $13, $4, 1, GROUP_ROUTE_44, MAP_ROUTE_44 warp_def $1b, $24, 7, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $5, $25, 1, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F warp_def $d, $25, 7, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_POKE_BALL, 11, 35, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e472, EVENT_GOT_HM07_WATERFALL person_event SPRITE_POKE_BALL, 27, 36, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e474, EVENT_ICE_PATH_1F_PP_UP diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 3887d9115..06a9d9ee8 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -1,8 +1,8 @@ IcePathB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -87,7 +87,7 @@ IcePathB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 8 warp_def $f, $3, 3, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F warp_def $3, $11, 1, GROUP_ICE_PATH_B2F_MAHOGANY_SIDE, MAP_ICE_PATH_B2F_MAHOGANY_SIDE @@ -98,14 +98,14 @@ IcePathB1F_MapEventHeader: warp_def $19, $5, 4, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F warp_def $1b, $b, 1, GROUP_ICE_PATH_B2F_BLACKTHORN_SIDE, MAP_ICE_PATH_B2F_BLACKTHORN_SIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 30, 17, SIGNPOST_ITEM, MapIcePathB1FSignpostItem0 - ; people-events +.PersonEvents: db 5 person_event SPRITE_BOULDER, 11, 15, OW_LEFT | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1 person_event SPRITE_BOULDER, 12, 11, OW_LEFT | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 0a9ca0ea9..cc2d35fed 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -1,8 +1,8 @@ IcePathB2FBlackthornSide_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x7e646: @@ -16,18 +16,18 @@ IcePathB2FBlackthornSide_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $f, $3, 8, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F warp_def $3, $3, 2, GROUP_ICE_PATH_B3F, MAP_ICE_PATH_B3F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 10, 2, SIGNPOST_ITEM, MapIcePathB2FBlackthornSideSignpostItem0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_POKE_BALL, 20, 12, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e646, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 0beef8b5a..925021077 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -1,8 +1,8 @@ IcePathB2FMahoganySide_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 BoulderScript_0x7e5a3: @@ -27,7 +27,7 @@ IcePathB2FMahoganySide_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $1, $11, 2, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F warp_def $b, $9, 1, GROUP_ICE_PATH_B3F, MAP_ICE_PATH_B3F @@ -36,14 +36,14 @@ IcePathB2FMahoganySide_MapEventHeader: warp_def $c, $4, 5, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F warp_def $c, $c, 6, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 17, 0, SIGNPOST_ITEM, MapIcePathB2FMahoganySideSignpostItem0 - ; people-events +.PersonEvents: db 6 person_event SPRITE_BOULDER, 7, 15, OW_DOWN | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A person_event SPRITE_BOULDER, 11, 8, OW_DOWN | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index 5158604b7..e03b38d16 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -1,8 +1,8 @@ IcePathB3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x7e66f: @@ -15,18 +15,18 @@ IcePathB3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $5, $3, 2, GROUP_ICE_PATH_B2F_MAHOGANY_SIDE, MAP_ICE_PATH_B2F_MAHOGANY_SIDE warp_def $5, $f, 2, GROUP_ICE_PATH_B2F_BLACKTHORN_SIDE, MAP_ICE_PATH_B2F_BLACKTHORN_SIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_POKE_BALL, 11, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e66f, EVENT_ICE_PATH_B3F_NEVERMELTICE person_event SPRITE_ROCK, 10, 10, OW_LEFT | $10, $0, -1, -1, $0, 0, IcePathB3FRock, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 719faec12..aa4535afb 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -1,8 +1,8 @@ IlexForest_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -931,16 +931,16 @@ IlexForest_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $5, $1, 3, GROUP_ROUTE_34_ILEX_FOREST_GATE, MAP_ROUTE_34_ILEX_FOREST_GATE warp_def $2a, $3, 1, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE warp_def $2b, $3, 2, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 5 signpost 17, 3, SIGNPOST_READ, MapIlexForestSignpost0Script signpost 7, 11, SIGNPOST_ITEM, MapIlexForestSignpostItem1 @@ -948,7 +948,7 @@ IlexForest_MapEventHeader: signpost 17, 1, SIGNPOST_ITEM, MapIlexForestSignpostItem3 signpost 22, 8, SIGNPOST_UP, MapIlexForestSignpost4Script - ; people-events +.PersonEvents: db 11 person_event SPRITE_BIRD, 35, 18, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BirdScript_0x6eb8f, EVENT_ILEX_FOREST_FARFETCHD person_event SPRITE_YOUNGSTER, 32, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6eb7b, EVENT_ILEX_FOREST_APPRENTICE diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 7b3eaa768..68ac4631f 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -1,8 +1,8 @@ IlexForestAzaleaGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x62c7a: @@ -30,20 +30,20 @@ IlexForestAzaleaGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 2, GROUP_ILEX_FOREST, MAP_ILEX_FOREST warp_def $5, $0, 3, GROUP_ILEX_FOREST, MAP_ILEX_FOREST warp_def $4, $9, 7, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $5, $9, 8, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x62c7a, -1 person_event SPRITE_GRANNY, 7, 5, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrannyScript_0x62c7d, -1 diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 1545d44ec..1e91d6319 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -1,11 +1,11 @@ IndigoPlateauPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x180009, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -302,22 +302,22 @@ IndigoPlateauPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $d, $5, 1, GROUP_ROUTE_23, MAP_ROUTE_23 warp_def $d, $6, 2, GROUP_ROUTE_23, MAP_ROUTE_23 warp_def $d, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F warp_def $3, $e, 1, GROUP_WILLS_ROOM, MAP_WILLS_ROOM - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $4, $10, $0, UnknownScript_0x180053, $0, $0 xy_trigger 0, $4, $11, $0, UnknownScript_0x180094, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 6 person_event SPRITE_NURSE, 11, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x18012c, -1 person_event SPRITE_CLERK, 11, 15, OW_UP | $2, $0, -1, -1, $0, 0, ClerkScript_0x18012f, -1 diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index ccd1931df..3e0f761e8 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -1,12 +1,12 @@ KarensRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x180bbc, $0000 dw UnknownScript_0x180bc0, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -138,19 +138,19 @@ KarensRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $11, $4, 3, GROUP_BRUNOS_ROOM, MAP_BRUNOS_ROOM warp_def $11, $5, 4, GROUP_BRUNOS_ROOM, MAP_BRUNOS_ROOM warp_def $2, $4, 1, GROUP_LANCES_ROOM, MAP_LANCES_ROOM warp_def $2, $5, 2, GROUP_LANCES_ROOM, MAP_LANCES_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_KAREN, 11, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, KarenScript_0x180bee, -1 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index a0027e522..957d4dc6c 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -1,12 +1,12 @@ KogasRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x180728, $0000 dw UnknownScript_0x18072c, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -135,19 +135,19 @@ KogasRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $11, $4, 2, GROUP_WILLS_ROOM, MAP_WILLS_ROOM warp_def $11, $5, 3, GROUP_WILLS_ROOM, MAP_WILLS_ROOM warp_def $2, $4, 1, GROUP_BRUNOS_ROOM, MAP_BRUNOS_ROOM warp_def $2, $5, 2, GROUP_BRUNOS_ROOM, MAP_BRUNOS_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_KOGA, 11, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, KogaScript_0x18075a, -1 diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 3ca74f2e7..e18a0b073 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -1,12 +1,12 @@ KrissHouse1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x7a4d6, $0000 dw UnknownScript_0x7a4d7, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x7a4d6: @@ -384,25 +384,25 @@ KrissHouse1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $6, 2, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN warp_def $7, $7, 2, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN warp_def $0, $9, 1, GROUP_KRISS_HOUSE_2F, MAP_KRISS_HOUSE_2F - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $4, $8, $0, UnknownScript_0x7a4d8, $0, $0 xy_trigger 0, $4, $9, $0, UnknownScript_0x7a4db, $0, $0 - ; signposts +.Signposts: db 4 signpost 1, 0, SIGNPOST_READ, StoveScript signpost 1, 1, SIGNPOST_READ, SinkScript signpost 1, 2, SIGNPOST_READ, FridgeScript signpost 1, 4, SIGNPOST_READ, TVScript - ; people-events +.PersonEvents: db 5 person_event SPRITE_MOM, 8, 11, OW_LEFT | $0, $0, -1, -1, $0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1 person_event SPRITE_MOM, 6, 6, OW_UP | $3, $0, -1, 1, $0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index bffe5f16a..b3f66669d 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -1,8 +1,8 @@ KrissHouse2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -116,21 +116,21 @@ KrissHouse2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $0, $7, 3, GROUP_KRISS_HOUSE_1F, MAP_KRISS_HOUSE_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 signpost 1, 2, SIGNPOST_UP, KrissHousePC signpost 1, 3, SIGNPOST_READ, KrissHouseRadio signpost 1, 5, SIGNPOST_READ, KrissHouseBookshelf signpost 0, 6, SIGNPOST_IFSET, KrissHousePoster - ; people-events +.PersonEvents: db 4 person_event SPRITE_CONSOLE, 6, 8, OW_DOWN | $1, $0, -1, -1, $0, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE person_event SPRITE_DOLL_1, 8, 8, OW_DOWN | $1, $0, -1, -1, $0, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1 diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 1cc1259d2..33277c655 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -1,8 +1,8 @@ KrissNeighborsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 KrissNeighborsDaughter: @@ -98,21 +98,21 @@ KrissNeighborsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN warp_def $7, $3, 3, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 1, 0, SIGNPOST_READ, KrissNeighborsHouseBookshelf signpost 1, 1, SIGNPOST_READ, KrissNeighborsHouseBookshelf signpost 1, 7, SIGNPOST_READ, KrissNeighborsHouseRadio - ; people-events +.PersonEvents: db 2 person_event SPRITE_COOLTRAINER_F, 7, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, KrissNeighborsDaughter, -1 person_event SPRITE_POKEFAN_F, 7, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 81bc54ba6..ab800684a 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -1,8 +1,8 @@ KurtsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -676,15 +676,15 @@ KurtsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $3, 4, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $7, $4, 4, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 7 signpost 1, 6, SIGNPOST_READ, KurtsHouseRadio signpost 0, 8, SIGNPOST_READ, KurtsHouseOakPhoto @@ -694,7 +694,7 @@ KurtsHouse_MapEventHeader: signpost 1, 3, SIGNPOST_READ, KurtsHouseBookshelf signpost 1, 4, SIGNPOST_READ, KurtsHouseCelebiStatue - ; people-events +.PersonEvents: db 5 person_event SPRITE_KURT, 6, 7, OW_UP | $2, $0, -1, -1, $0, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1 person_event SPRITE_TWIN, 7, 9, OW_DOWN | $3, $0, -1, -1, $0, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1 diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index fdc14ebcd..48415c105 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -1,12 +1,12 @@ LakeofRage_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -491,15 +491,15 @@ LakeofRage_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $7, 1, GROUP_LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, MAP_LAKE_OF_RAGE_HIDDEN_POWER_HOUSE warp_def $1f, $1b, 1, GROUP_LAKE_OF_RAGE_MAGIKARP_HOUSE, MAP_LAKE_OF_RAGE_MAGIKARP_HOUSE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 5 signpost 27, 21, SIGNPOST_READ, MapLakeofRageSignpost0Script signpost 31, 25, SIGNPOST_READ, MapLakeofRageSignpost1Script @@ -507,7 +507,7 @@ LakeofRage_MapEventHeader: signpost 4, 4, SIGNPOST_ITEM, MapLakeofRageSignpostItem3 signpost 5, 35, SIGNPOST_ITEM, MapLakeofRageSignpostItem4 - ; people-events +.PersonEvents: db 12 person_event SPRITE_LANCE, 32, 25, OW_UP | $3, $0, -1, -1, $0, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE person_event SPRITE_GRAMPS, 30, 24, OW_UP | $3, $0, -1, -1, $0, 0, GrampsScript_0x7008e, -1 diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index 9768947af..927b0f50f 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -1,8 +1,8 @@ LakeofRageHiddenPowerHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 HiddenPowerGuy: @@ -68,19 +68,19 @@ LakeofRageHiddenPowerHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_LAKE_OF_RAGE, MAP_LAKE_OF_RAGE warp_def $7, $3, 1, GROUP_LAKE_OF_RAGE, MAP_LAKE_OF_RAGE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, HiddenPowerHouseBookshelf signpost 1, 1, SIGNPOST_READ, HiddenPowerHouseBookshelf - ; people-events +.PersonEvents: db 1 person_event SPRITE_FISHER, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, HiddenPowerGuy, -1 diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index 234ef2842..849641d3d 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -1,8 +1,8 @@ LakeofRageMagikarpHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FishingGuruScript_0x19a6ae: @@ -206,19 +206,19 @@ LakeofRageMagikarpHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_LAKE_OF_RAGE, MAP_LAKE_OF_RAGE warp_def $7, $3, 2, GROUP_LAKE_OF_RAGE, MAP_LAKE_OF_RAGE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, MagikarpHouseBookshelf signpost 1, 1, SIGNPOST_READ, MagikarpHouseBookshelf - ; people-events +.PersonEvents: db 1 person_event SPRITE_FISHING_GURU, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, FishingGuruScript_0x19a6ae, -1 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 59b5f5de7..adb731ceb 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -1,12 +1,12 @@ LancesRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x180e39, $0000 dw UnknownScript_0x180e3d, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -341,22 +341,22 @@ LancesRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $17, $4, 3, GROUP_KARENS_ROOM, MAP_KARENS_ROOM warp_def $17, $5, 4, GROUP_KARENS_ROOM, MAP_KARENS_ROOM warp_def $1, $4, 1, GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME warp_def $1, $5, 2, GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME - ; xy triggers +.XYTriggers: db 2 xy_trigger 1, $5, $4, $0, UnknownScript_0x180e6a, $0, $0 xy_trigger 1, $5, $5, $0, UnknownScript_0x180e74, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_LANCE, 7, 9, OW_UP | $2, $0, -1, -1, $0, 0, LanceScript_0x180e7b, -1 person_event SPRITE_TEACHER, 11, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 9d7779e4e..ac7b6fc58 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -1,8 +1,8 @@ LavRadioTower1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ReceptionistScript_0x7ee63: @@ -218,20 +218,20 @@ LavRadioTower1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 7, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN warp_def $7, $3, 7, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 0, 11, SIGNPOST_READ, MapLavRadioTower1FSignpost0Script signpost 0, 5, SIGNPOST_READ, MapLavRadioTower1FSignpost1Script - ; people-events +.PersonEvents: db 5 person_event SPRITE_RECEPTIONIST, 10, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x7ee63, -1 person_event SPRITE_OFFICER, 5, 19, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x7ee66, -1 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 0ad443074..5e67cd923 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -1,8 +1,8 @@ LavenderMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x7eb1c: @@ -46,18 +46,18 @@ LavenderMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 5, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN warp_def $7, $3, 5, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x7eb1c, -1 person_event SPRITE_POKEFAN_M, 10, 10, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x7eb23, -1 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 2c1180a2a..ac813572a 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -1,11 +1,11 @@ LavenderNameRater_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x7eaf1, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x7eaf1: @@ -27,17 +27,17 @@ LavenderNameRater_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN warp_def $7, $3, 4, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_GENTLEMAN, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, LavenderNameRater, -1 diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm index 803c66711..716cf4254 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokeCenter1F.asm @@ -1,8 +1,8 @@ LavenderPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x7e6a0: @@ -78,19 +78,19 @@ LavenderPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN warp_def $7, $4, 1, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x7e6a0, -1 person_event SPRITE_GENTLEMAN, 10, 11, OW_UP | $1, $1, -1, -1, $0, 0, GentlemanScript_0x7e6a3, -1 diff --git a/maps/LavenderPokeCenter2FBeta.asm b/maps/LavenderPokeCenter2FBeta.asm index daf796b44..3f8caf8f9 100644 --- a/maps/LavenderPokeCenter2FBeta.asm +++ b/maps/LavenderPokeCenter2FBeta.asm @@ -1,23 +1,23 @@ LavenderPokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 LavenderPokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_LAVENDER_POKECENTER_1F, MAP_LAVENDER_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 474e1ce2d..5ad9f91fe 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -1,8 +1,8 @@ LavenderTown_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -105,7 +105,7 @@ LavenderTown_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 7 warp_def $5, $5, 1, GROUP_LAVENDER_POKECENTER_1F, MAP_LAVENDER_POKECENTER_1F warp_def $9, $5, 1, GROUP_MR_FUJIS_HOUSE, MAP_MR_FUJIS_HOUSE @@ -115,10 +115,10 @@ LavenderTown_MapEventHeader: warp_def $b, $d, 1, GROUP_SOUL_HOUSE, MAP_SOUL_HOUSE warp_def $5, $e, 1, GROUP_LAV_RADIO_TOWER_1F, MAP_LAV_RADIO_TOWER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 signpost 3, 11, SIGNPOST_READ, LavenderTownSign signpost 7, 15, SIGNPOST_READ, KantoRadioStationSign @@ -127,7 +127,7 @@ LavenderTown_MapEventHeader: signpost 5, 6, SIGNPOST_READ, LavenderPokeCenterSignText signpost 5, 2, SIGNPOST_READ, LavenderMartSignText - ; people-events +.PersonEvents: db 4 person_event SPRITE_POKEFAN_M, 11, 16, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x1ad6e4, -1 person_event SPRITE_TEACHER, 19, 6, OW_UP | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x1ad6e7, -1 diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm index f8f3fbcf0..78af1d47c 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderTownSpeechHouse.asm @@ -1,8 +1,8 @@ LavenderTownSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanFScript_0x7ea47: @@ -29,19 +29,19 @@ LavenderTownSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN warp_def $7, $3, 3, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, LavenderTownSpeechHouseBookshelf signpost 1, 1, SIGNPOST_READ, LavenderTownSpeechHouseBookshelf - ; people-events +.PersonEvents: db 1 person_event SPRITE_POKEFAN_F, 7, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, PokefanFScript_0x7ea47, -1 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 196560771..4ceb6f660 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -1,8 +1,8 @@ MahoganyGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PryceScript_0x199a9e: @@ -367,20 +367,20 @@ MahoganyGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $11, $4, 3, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN warp_def $11, $5, 3, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 15, 3, SIGNPOST_READ, MahoganyGymStatue signpost 15, 6, SIGNPOST_READ, MahoganyGymStatue - ; people-events +.PersonEvents: db 7 person_event SPRITE_PRYCE, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PryceScript_0x199a9e, -1 person_event SPRITE_BUENA, 10, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerSkierRoxanne, -1 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 4e285ac07..9a725f422 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -1,12 +1,12 @@ MahoganyMart1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x6c356, $0000 dw UnknownScript_0x6c357, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -222,19 +222,19 @@ MahoganyMart1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN warp_def $7, $4, 1, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN warp_def $3, $7, 1, GROUP_TEAM_ROCKET_BASE_B1F, MAP_TEAM_ROCKET_BASE_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 5 person_event SPRITE_PHARMACIST, 7, 8, OW_UP | $2, $0, -1, -1, $0, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_BLACK_BELT, 10, 5, OW_DOWN | $3, $0, -1, -1, $0, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokeCenter1F.asm index b304a2afe..8a5374fb0 100644 --- a/maps/MahoganyPokeCenter1F.asm +++ b/maps/MahoganyPokeCenter1F.asm @@ -1,8 +1,8 @@ MahoganyPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x19a356: @@ -51,19 +51,19 @@ MahoganyPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 4, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN warp_def $7, $4, 4, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x19a356, -1 person_event SPRITE_POKEFAN_M, 6, 11, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x19a359, -1 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 34826b541..347b64441 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -1,8 +1,8 @@ MahoganyRedGyaradosSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 BlackBeltScript_0x19997f: @@ -60,18 +60,18 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN warp_def $7, $3, 2, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_BLACK_BELT, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, BlackBeltScript_0x19997f, -1 person_event SPRITE_TEACHER, 9, 10, OW_UP | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x199982, -1 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index f538d5bef..d48596bd3 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -1,12 +1,12 @@ MahoganyTown_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -246,7 +246,7 @@ MahoganyTown_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $7, $b, 1, GROUP_MAHOGANY_MART_1F, MAP_MAHOGANY_MART_1F warp_def $7, $11, 1, GROUP_MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, MAP_MAHOGANY_RED_GYARADOS_SPEECH_HOUSE @@ -254,19 +254,19 @@ MahoganyTown_MapEventHeader: warp_def $d, $f, 1, GROUP_MAHOGANY_POKECENTER_1F, MAP_MAHOGANY_POKECENTER_1F warp_def $1, $9, 3, GROUP_ROUTE_43_MAHOGANY_GATE, MAP_ROUTE_43_MAHOGANY_GATE - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $8, $13, $0, UnknownScript_0x190013, $0, $0 xy_trigger 0, $9, $13, $0, UnknownScript_0x190013, $0, $0 - ; signposts +.Signposts: db 4 signpost 5, 1, SIGNPOST_READ, MahoganyTownSign signpost 7, 9, SIGNPOST_READ, MahoganyTownRagecandybarSign signpost 13, 3, SIGNPOST_READ, MahoganyGymSign signpost 13, 16, SIGNPOST_READ, MahoganyTownPokeCenterSign - ; people-events +.PersonEvents: db 4 person_event SPRITE_POKEFAN_M, 12, 23, OW_UP | $2, $0, -1, -1, $0, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST person_event SPRITE_GRAMPS, 13, 10, OW_UP | $1, $1, -1, -1, $0, 0, GrampsScript_0x19007e, -1 diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 64c46aa4f..4353733db 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -1,8 +1,8 @@ ManiasHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 RockerScript_0x9d278: @@ -199,17 +199,17 @@ ManiasHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY warp_def $7, $3, 1, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_ROCKER, 8, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, RockerScript_0x9d278, -1 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 7a312625a..e721f5dfa 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -1,12 +1,12 @@ MobileBattleRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 0 .Trigger1: @@ -72,17 +72,17 @@ MobileBattleRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $4, 6, GROUP_POKECENTER_2F, MAP_POKECENTER_2F warp_def $7, $5, 6, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 2, 4, SIGNPOST_UP, MapMobileBattleRoomSignpost0Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index f5e87057c..8bea1200e 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -1,12 +1,12 @@ MobileTradeRoomMobile_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 0 .Trigger1: @@ -40,17 +40,17 @@ MobileTradeRoomMobile_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $4, 5, GROUP_POKECENTER_2F, MAP_POKECENTER_2F warp_def $7, $5, 5, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 2, 4, SIGNPOST_UP, MapMobileTradeRoomMobileSignpost0Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 119a0db2e..94ef24277 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -1,12 +1,12 @@ MountMoon_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x74089, $0000 dw UnknownScript_0x7408d, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x74089: @@ -163,7 +163,7 @@ MountMoon_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 8 warp_def $3, $3, 1, GROUP_ROUTE_3, MAP_ROUTE_3 warp_def $f, $f, 1, GROUP_ROUTE_4, MAP_ROUTE_4 @@ -174,12 +174,12 @@ MountMoon_MapEventHeader: warp_def $3, $19, 3, GROUP_MOUNT_MOON, MAP_MOUNT_MOON warp_def $d, $19, 4, GROUP_MOUNT_MOON, MAP_MOUNT_MOON - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_SILVER, 7, 11, OW_LEFT | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MT_MOON_RIVAL diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index e7014618c..673cbde08 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -1,8 +1,8 @@ MountMoonGiftShop_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GrampsScript_0x771a8: @@ -25,18 +25,18 @@ MountMoonGiftShop_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $3, 3, GROUP_MOUNT_MOON_SQUARE, MAP_MOUNT_MOON_SQUARE warp_def $7, $4, 3, GROUP_MOUNT_MOON_SQUARE, MAP_MOUNT_MOON_SQUARE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_GRAMPS, 7, 8, OW_UP | $2, $0, -1, 1, $0, 0, GrampsScript_0x771a8, -1 person_event SPRITE_GRAMPS, 6, 5, OW_LEFT | $1, $0, -1, 2, $0, 0, GrampsScript_0x771a8, -1 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 70cbe4e76..111b1284b 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -1,11 +1,11 @@ MountMoonSquare_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x77092, $0000 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -138,22 +138,22 @@ MountMoonSquare_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $5, $14, 5, GROUP_MOUNT_MOON, MAP_MOUNT_MOON warp_def $b, $16, 6, GROUP_MOUNT_MOON, MAP_MOUNT_MOON warp_def $7, $d, 1, GROUP_MOUNT_MOON_GIFT_SHOP, MAP_MOUNT_MOON_GIFT_SHOP - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $b, $7, $0, UnknownScript_0x7709a, $0, $0 - ; signposts +.Signposts: db 2 signpost 7, 7, SIGNPOST_ITEM, MapMountMoonSquareSignpostItem0 signpost 7, 17, SIGNPOST_READ, MapMountMoonSquareSignpost1Script - ; people-events +.PersonEvents: db 3 person_event SPRITE_FAIRY, 10, 10, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY person_event SPRITE_FAIRY, 10, 11, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 173d842da..2f8def0ae 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -1,8 +1,8 @@ MountMortar1FInside_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerPokemaniacMiller: @@ -109,7 +109,7 @@ MountMortar1FInside_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $2f, $b, 5, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE warp_def $2f, $1d, 6, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE @@ -118,14 +118,14 @@ MountMortar1FInside_MapEventHeader: warp_def $13, $3, 1, GROUP_MOUNT_MORTAR_B1F, MAP_MOUNT_MORTAR_B1F warp_def $9, $9, 2, GROUP_MOUNT_MORTAR_2F_INSIDE, MAP_MOUNT_MORTAR_2F_INSIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 11, 30, SIGNPOST_ITEM, MapMountMortar1FInsideSignpostItem0 - ; people-events +.PersonEvents: db 10 person_event SPRITE_BOULDER, 47, 25, OW_LEFT | $11, $0, -1, -1, $0, 0, MountMortar1FBoulder, -1 person_event SPRITE_POKE_BALL, 42, 39, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de7c, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index 55b4fa695..81d95b2c8 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -1,8 +1,8 @@ MountMortar1FOutside_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x7ddf6: @@ -19,7 +19,7 @@ MountMortar1FOutside_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 9 warp_def $21, $3, 3, GROUP_ROUTE_42, MAP_ROUTE_42 warp_def $21, $11, 4, GROUP_ROUTE_42, MAP_ROUTE_42 @@ -31,14 +31,14 @@ MountMortar1FOutside_MapEventHeader: warp_def $d, $7, 3, GROUP_MOUNT_MORTAR_1F_INSIDE, MAP_MOUNT_MORTAR_1F_INSIDE warp_def $d, $21, 4, GROUP_MOUNT_MORTAR_1F_INSIDE, MAP_MOUNT_MORTAR_1F_INSIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 22, 25, SIGNPOST_ITEM, MapMountMortar1FOutsideSignpostItem0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_POKE_BALL, 19, 17, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ddf6, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER person_event SPRITE_POKE_BALL, 22, 35, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ddf8, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index c884ee4b3..cbd8589a7 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -1,8 +1,8 @@ MountMortar2FInside_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerSupernerdHugh: @@ -62,19 +62,19 @@ MountMortar2FInside_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $21, $11, 4, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE warp_def $5, $3, 6, GROUP_MOUNT_MORTAR_1F_INSIDE, MAP_MOUNT_MORTAR_1F_INSIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 8, 24, SIGNPOST_ITEM, MapMountMortar2FInsideSignpostItem0 - ; people-events +.PersonEvents: db 7 person_event SPRITE_POKE_BALL, 26, 32, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0de, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION person_event SPRITE_POKE_BALL, 37, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e0, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 2ce42173d..e64b8566a 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -1,8 +1,8 @@ MountMortarB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 BlackBeltScript_0x7e1f6: @@ -130,19 +130,19 @@ MountMortarB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $3, 5, GROUP_MOUNT_MORTAR_1F_INSIDE, MAP_MOUNT_MORTAR_1F_INSIDE warp_def $1d, $13, 7, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 6, 4, SIGNPOST_ITEM, MapMountMortarB1FSignpostItem0 - ; people-events +.PersonEvents: db 7 person_event SPRITE_POKE_BALL, 16, 33, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e240, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION person_event SPRITE_POKE_BALL, 20, 8, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e242, EVENT_MOUNT_MORTAR_B1F_CARBOS diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index fe0e5a398..693a42090 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -1,8 +1,8 @@ MoveDeletersHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MoveDeleter: @@ -20,19 +20,19 @@ MoveDeletersHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 6, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $7, $3, 6, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, MoveDeletersHouseBookshelf signpost 1, 1, SIGNPOST_READ, MoveDeletersHouseBookshelf - ; people-events +.PersonEvents: db 1 person_event SPRITE_SUPER_NERD, 7, 6, OW_UP | $2, $0, -1, -1, $0, 0, MoveDeleter, -1 diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 55b86f01a..ad6fd7526 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -1,8 +1,8 @@ MrFujisHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SuperNerdScript_0x7e8ca: @@ -76,20 +76,20 @@ MrFujisHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN warp_def $7, $3, 2, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, MrFujisHouseBookshelf signpost 1, 1, SIGNPOST_READ, MrFujisHouseBookshelf - ; people-events +.PersonEvents: db 5 person_event SPRITE_SUPER_NERD, 5, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x7e8ca, -1 person_event SPRITE_LASS, 8, 7, OW_DOWN | $2, $11, -1, -1, $0, 0, LassScript_0x7e8cd, -1 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index e808c2d49..3a45cf125 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -1,12 +1,12 @@ MrPokemonsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x196e51, $0000 dw UnknownScript_0x196e55, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x196e51: @@ -374,15 +374,15 @@ MrPokemonsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_ROUTE_30, MAP_ROUTE_30 warp_def $7, $3, 2, GROUP_ROUTE_30, MAP_ROUTE_30 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 5 signpost 1, 0, SIGNPOST_READ, MapMrPokemonsHouseSignpost1Script signpost 1, 1, SIGNPOST_READ, MapMrPokemonsHouseSignpost1Script @@ -390,7 +390,7 @@ MrPokemonsHouse_MapEventHeader: signpost 1, 7, SIGNPOST_READ, MapMrPokemonsHouseSignpost3Script signpost 4, 6, SIGNPOST_READ, MapMrPokemonsHouseSignpost4Script - ; people-events +.PersonEvents: db 2 person_event SPRITE_GENTLEMAN, 9, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, GentlemanScript_0x196e97, -1 person_event SPRITE_OAK, 9, 10, OW_UP | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 2c07cc5b9..182d7f30c 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -1,8 +1,8 @@ MrPsychicsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MrPsychic: @@ -48,19 +48,19 @@ MrPsychicsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 5, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $7, $3, 5, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, MrPsychicsHouseBookshelf signpost 1, 1, SIGNPOST_READ, MrPsychicsHouseBookshelf - ; people-events +.PersonEvents: db 1 person_event SPRITE_FISHING_GURU, 7, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, MrPsychic, -1 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index cadc9948c..d352d5ec3 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -1,8 +1,8 @@ NationalPark_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 LassScript_0x5c002: @@ -502,24 +502,24 @@ NationalPark_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $12, $21, 1, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE warp_def $13, $21, 2, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE warp_def $2f, $a, 1, GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE warp_def $2f, $b, 2, GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 signpost 44, 14, SIGNPOST_READ, MapNationalParkSignpost0Script signpost 31, 27, SIGNPOST_READ, MapNationalParkSignpost1Script signpost 47, 6, SIGNPOST_ITEM, MapNationalParkSignpostItem2 signpost 4, 12, SIGNPOST_READ, MapNationalParkSignpost3Script - ; people-events +.PersonEvents: db 14 person_event SPRITE_LASS, 28, 19, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x5c002, -1 person_event SPRITE_POKEFAN_F, 8, 18, OW_UP | $2, $0, -1, -1, $0, 0, PokefanFScript_0x5c005, -1 diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index ddc371ae8..fb31d0bbd 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -1,8 +1,8 @@ NationalParkBugContest_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 YoungsterScript_0x5c8ec: @@ -211,24 +211,24 @@ NationalParkBugContest_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $12, $21, 1, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE warp_def $13, $21, 1, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE warp_def $2f, $a, 1, GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE warp_def $2f, $b, 1, GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 signpost 44, 14, SIGNPOST_READ, MapNationalParkBugContestSignpost0Script signpost 31, 27, SIGNPOST_READ, MapNationalParkBugContestSignpost1Script signpost 47, 6, SIGNPOST_ITEM, MapNationalParkBugContestSignpostItem2 signpost 4, 12, SIGNPOST_READ, MapNationalParkBugContestSignpost3Script - ; people-events +.PersonEvents: db 12 person_event SPRITE_YOUNGSTER, 33, 23, OW_DOWN | $2, $22, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A person_event SPRITE_YOUNGSTER, 26, 32, OW_DOWN | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 8f0952505..9513b4104 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -1,12 +1,12 @@ NewBarkTown_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -284,26 +284,26 @@ NewBarkTown_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $3, $6, 1, GROUP_ELMS_LAB, MAP_ELMS_LAB warp_def $5, $d, 1, GROUP_KRISS_HOUSE_1F, MAP_KRISS_HOUSE_1F warp_def $b, $3, 1, GROUP_KRISS_NEIGHBORS_HOUSE, MAP_KRISS_NEIGHBORS_HOUSE warp_def $d, $b, 1, GROUP_ELMS_HOUSE, MAP_ELMS_HOUSE - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $8, $1, $0, UnknownScript_0x1a8016, $0, $0 xy_trigger 0, $9, $1, $0, UnknownScript_0x1a8041, $0, $0 - ; signposts +.Signposts: db 4 signpost 8, 8, SIGNPOST_READ, MapNewBarkTownSignpost0Script signpost 5, 11, SIGNPOST_READ, MapNewBarkTownSignpost1Script signpost 3, 3, SIGNPOST_READ, MapNewBarkTownSignpost2Script signpost 13, 9, SIGNPOST_READ, MapNewBarkTownSignpost3Script - ; people-events +.PersonEvents: db 3 person_event SPRITE_TEACHER, 12, 10, OW_DOWN | $3, $1, -1, -1, $0, 0, TeacherScript_0x1a806f, -1 person_event SPRITE_FISHER, 13, 16, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a809b, -1 diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index f8b28279b..7f78384a9 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -1,8 +1,8 @@ OaksLab_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x19b3c7: @@ -254,15 +254,15 @@ OaksLab_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $b, $4, 3, GROUP_PALLET_TOWN, MAP_PALLET_TOWN warp_def $b, $5, 3, GROUP_PALLET_TOWN, MAP_PALLET_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 16 signpost 1, 6, SIGNPOST_READ, OaksLabBookshelf signpost 1, 7, SIGNPOST_READ, OaksLabBookshelf @@ -281,7 +281,7 @@ OaksLab_MapEventHeader: signpost 3, 9, SIGNPOST_READ, OaksLabTrashcan signpost 1, 0, SIGNPOST_READ, OaksLabPC - ; people-events +.PersonEvents: db 4 person_event SPRITE_OAK, 6, 8, OW_UP | $2, $0, -1, -1, $0, 0, Oak, -1 person_event SPRITE_SCIENTIST, 12, 5, OW_UP | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x19b40f, -1 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 5525cf446..31bcb3a96 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -1,8 +1,8 @@ OlivineCafe_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SailorScript_0x9c8c1: @@ -77,18 +77,18 @@ OlivineCafe_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 7, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $3, 7, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_SAILOR, 7, 8, OW_LEFT | $0, $0, -1, -1, $0, 0, SailorScript_0x9c8c1, -1 person_event SPRITE_FISHING_GURU, 7, 11, OW_UP | $0, $10, -1, -1, $0, 0, FishingGuruScript_0x9c8d9, -1 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index df55db57b..5dc18c99f 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -1,12 +1,12 @@ OlivineCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -289,7 +289,7 @@ OlivineCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 11 warp_def $15, $d, 1, GROUP_OLIVINE_POKECENTER_1F, MAP_OLIVINE_POKECENTER_1F warp_def $b, $a, 1, GROUP_OLIVINE_GYM, MAP_OLIVINE_GYM @@ -303,12 +303,12 @@ OlivineCity_MapEventHeader: warp_def $1b, $13, 1, GROUP_OLIVINE_PORT_PASSAGE, MAP_OLIVINE_PORT_PASSAGE warp_def $1b, $14, 2, GROUP_OLIVINE_PORT_PASSAGE, MAP_OLIVINE_PORT_PASSAGE - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $c, $d, $0, UnknownScript_0x1a8833, $0, $0 xy_trigger 0, $d, $d, $0, UnknownScript_0x1a886b, $0, $0 - ; signposts +.Signposts: db 7 signpost 11, 17, SIGNPOST_READ, OlivineCitySign signpost 24, 20, SIGNPOST_READ, OlivineCityPortSign @@ -318,7 +318,7 @@ OlivineCity_MapEventHeader: signpost 21, 14, SIGNPOST_READ, OlivineCityPokeCenterSign signpost 17, 20, SIGNPOST_READ, OlivineCityMartSign - ; people-events +.PersonEvents: db 4 person_event SPRITE_SAILOR, 31, 30, OW_UP | $0, $10, -1, -1, $0, 0, SailorScript_0x1a88a3, -1 person_event SPRITE_STANDING_YOUNGSTER, 17, 24, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, StandingYoungsterScript_0x1a88a6, -1 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 9c58d4f08..676c074fc 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -1,8 +1,8 @@ OlivineGoodRodHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GoodRodGuru: @@ -83,17 +83,17 @@ OlivineGoodRodHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 6, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $3, 6, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_FISHING_GURU, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GoodRodGuru, -1 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 8dd165589..b1195f8dd 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -1,8 +1,8 @@ OlivineGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 JasmineScript_0x9c12f: @@ -197,20 +197,20 @@ OlivineGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $f, $4, 2, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $f, $5, 2, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 13, 3, SIGNPOST_READ, OlivineGymStatue signpost 13, 6, SIGNPOST_READ, OlivineGymStatue - ; people-events +.PersonEvents: db 2 person_event SPRITE_JASMINE, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE person_event SPRITE_GYM_GUY, 17, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OlivineGymGuyScript, -1 diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index fe2077813..9cfac68a2 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -1,8 +1,8 @@ OlivineHouseBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x9c58f: @@ -39,20 +39,20 @@ OlivineHouseBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $3, 4, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, OlivineHouseBetaBookshelf1 signpost 1, 1, SIGNPOST_READ, OlivineHouseBetaBookshelf2 - ; people-events +.PersonEvents: db 2 person_event SPRITE_TEACHER, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, TeacherScript_0x9c58f, -1 person_event SPRITE_RHYDON, 8, 10, OW_UP | $0, $20, -1, -1, $0, 0, RhydonScript_0x9c592, -1 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 228398312..d63d7b039 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -1,8 +1,8 @@ OlivineLighthouse1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SailorScript_0x5ae67: @@ -36,7 +36,7 @@ OlivineLighthouse1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $11, $a, 9, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $11, $b, 9, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY @@ -44,13 +44,13 @@ OlivineLighthouse1F_MapEventHeader: warp_def $d, $10, 3, GROUP_OLIVINE_LIGHTHOUSE_2F, MAP_OLIVINE_LIGHTHOUSE_2F warp_def $d, $11, 4, GROUP_OLIVINE_LIGHTHOUSE_2F, MAP_OLIVINE_LIGHTHOUSE_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_SAILOR, 6, 12, OW_UP | $2, $0, -1, -1, $0, 0, SailorScript_0x5ae67, -1 person_event SPRITE_POKEFAN_F, 13, 20, OW_UP | $0, $20, -1, -1, $0, 0, PokefanFScript_0x5ae6a, -1 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index cfa79d042..2fd90734b 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -1,8 +1,8 @@ OlivineLighthouse2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerGentlemanAlfred: @@ -204,7 +204,7 @@ OlivineLighthouse2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $b, $3, 3, GROUP_OLIVINE_LIGHTHOUSE_1F, MAP_OLIVINE_LIGHTHOUSE_1F warp_def $3, $5, 2, GROUP_OLIVINE_LIGHTHOUSE_3F, MAP_OLIVINE_LIGHTHOUSE_3F @@ -213,13 +213,13 @@ OlivineLighthouse2F_MapEventHeader: warp_def $b, $10, 4, GROUP_OLIVINE_LIGHTHOUSE_3F, MAP_OLIVINE_LIGHTHOUSE_3F warp_def $b, $11, 5, GROUP_OLIVINE_LIGHTHOUSE_3F, MAP_OLIVINE_LIGHTHOUSE_3F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_SAILOR, 7, 13, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorHuey1, -1 person_event SPRITE_GENTLEMAN, 12, 21, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerGentlemanAlfred, -1 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index df58e40ff..e3603d91b 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -1,8 +1,8 @@ OlivineLighthouse3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBird_keeperTheo: @@ -110,7 +110,7 @@ OlivineLighthouse3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 9 warp_def $3, $d, 1, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F warp_def $3, $5, 2, GROUP_OLIVINE_LIGHTHOUSE_2F, MAP_OLIVINE_LIGHTHOUSE_2F @@ -122,13 +122,13 @@ OlivineLighthouse3F_MapEventHeader: warp_def $3, $8, 7, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F warp_def $3, $9, 8, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_SAILOR, 6, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSailorTerrell, -1 person_event SPRITE_GENTLEMAN, 9, 17, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerGentlemanPreston, -1 diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index c234583af..4b62a34bd 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -1,8 +1,8 @@ OlivineLighthouse4F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerLassConnie: @@ -81,7 +81,7 @@ OlivineLighthouse4F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 10 warp_def $3, $d, 1, GROUP_OLIVINE_LIGHTHOUSE_3F, MAP_OLIVINE_LIGHTHOUSE_3F warp_def $5, $3, 2, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F @@ -94,13 +94,13 @@ OlivineLighthouse4F_MapEventHeader: warp_def $7, $10, 4, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F warp_def $7, $11, 5, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_SAILOR, 18, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorKent, -1 person_event SPRITE_LASS, 6, 15, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerLassConnie, -1 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index ba46a42c3..7bc8285c5 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -1,8 +1,8 @@ OlivineLighthouse5F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBird_keeperDenis: @@ -88,7 +88,7 @@ OlivineLighthouse5F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 7 warp_def $f, $9, 1, GROUP_OLIVINE_LIGHTHOUSE_6F, MAP_OLIVINE_LIGHTHOUSE_6F warp_def $5, $3, 2, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F @@ -98,14 +98,14 @@ OlivineLighthouse5F_MapEventHeader: warp_def $5, $10, 2, GROUP_OLIVINE_LIGHTHOUSE_6F, MAP_OLIVINE_LIGHTHOUSE_6F warp_def $5, $11, 3, GROUP_OLIVINE_LIGHTHOUSE_6F, MAP_OLIVINE_LIGHTHOUSE_6F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 13, 3, SIGNPOST_ITEM, MapOlivineLighthouse5FSignpostItem0 - ; people-events +.PersonEvents: db 5 person_event SPRITE_SAILOR, 15, 12, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorErnest, -1 person_event SPRITE_YOUNGSTER, 7, 12, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerBird_keeperDenis, -1 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index a86c5c00e..bdb351af7 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -1,8 +1,8 @@ OlivineLighthouse6F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 JasmineScript_0x60b91: @@ -256,19 +256,19 @@ OlivineLighthouse6F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $f, $9, 1, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F warp_def $5, $10, 6, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F warp_def $5, $11, 7, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_JASMINE, 12, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE person_event SPRITE_MONSTER, 12, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MonsterScript_0x60c3a, -1 diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index f43777e8e..f8910aceb 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -1,8 +1,8 @@ OlivineMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x9cac7: @@ -44,18 +44,18 @@ OlivineMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 8, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $3, 8, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x9cac7, -1 person_event SPRITE_COOLTRAINER_F, 6, 10, OW_UP | $1, $2, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x9cace, -1 diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokeCenter1F.asm index 8f43b3c1f..8c45a40c8 100644 --- a/maps/OlivinePokeCenter1F.asm +++ b/maps/OlivinePokeCenter1F.asm @@ -1,8 +1,8 @@ OlivinePokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x9c002: @@ -45,19 +45,19 @@ OlivinePokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $4, 1, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x9c002, -1 person_event SPRITE_FISHING_GURU, 8, 12, OW_UP | $1, $1, -1, -1, $0, 0, FishingGuruScript_0x9c005, -1 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index bb8cce9ba..e68aa1edd 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -1,12 +1,12 @@ OlivinePort_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x748ac, $0000 dw UnknownScript_0x748ad, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x748ac: @@ -382,20 +382,20 @@ OlivinePort_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $b, 5, GROUP_OLIVINE_PORT_PASSAGE, MAP_OLIVINE_PORT_PASSAGE warp_def $17, $7, 1, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $f, $7, $0, UnknownScript_0x7491f, $0, $0 - ; signposts +.Signposts: db 1 signpost 22, 1, SIGNPOST_ITEM, MapOlivinePortSignpostItem0 - ; people-events +.PersonEvents: db 7 person_event SPRITE_SAILOR, 27, 11, OW_UP | $3, $0, -1, -1, $0, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY person_event SPRITE_SAILOR, 19, 11, OW_UP | $3, $0, -1, -1, $0, 0, SailorScript_0x749fe, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index ac15ec8da..22a0a322f 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -1,8 +1,8 @@ OlivinePortPassage_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x76fac: @@ -20,7 +20,7 @@ OlivinePortPassage_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $0, $f, 10, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $0, $10, 11, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY @@ -28,12 +28,12 @@ OlivinePortPassage_MapEventHeader: warp_def $2, $3, 3, GROUP_OLIVINE_PORT_PASSAGE, MAP_OLIVINE_PORT_PASSAGE warp_def $e, $3, 1, GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_POKEFAN_M, 5, 21, OW_LEFT | $0, $0, -1, -1, $0, 0, PokefanMScript_0x76fac, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index fdbeeaae8..9d9c784e1 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -1,8 +1,8 @@ OlivinePunishmentSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OlivinePunishmentSpeechHouseDad: @@ -39,20 +39,20 @@ OlivinePunishmentSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 5, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $3, 5, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, OlivinePunishmentSpeechHouseBookshelf1 signpost 1, 1, SIGNPOST_READ, OlivinePunishmentSpeechHouseBookshelf2 - ; people-events +.PersonEvents: db 2 person_event SPRITE_POKEFAN_M, 6, 5, OW_DOWN | $3, $0, -1, -1, $0, 0, OlivinePunishmentSpeechHouseDad, -1 person_event SPRITE_LASS, 9, 9, OW_UP | $1, $2, -1, -1, $0, 0, OlivinePunishmentSpeechHouseDaughter, -1 diff --git a/maps/OlivineVoltorbHouse.asm b/maps/OlivineVoltorbHouse.asm index 150d928e4..4fc047470 100644 --- a/maps/OlivineVoltorbHouse.asm +++ b/maps/OlivineVoltorbHouse.asm @@ -1,8 +1,8 @@ OlivineVoltorbHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 Tim: @@ -20,19 +20,19 @@ OlivineVoltorbHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $3, 3, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, TimsHouseBookshelf signpost 1, 1, SIGNPOST_READ, TimsHouseBookshelf - ; people-events +.PersonEvents: db 1 person_event SPRITE_FISHING_GURU, 7, 6, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Tim, -1 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 33f285e3f..c6a64db89 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -1,8 +1,8 @@ PalletTown_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -71,23 +71,23 @@ PalletTown_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $5, $5, 1, GROUP_REDS_HOUSE_1F, MAP_REDS_HOUSE_1F warp_def $5, $d, 1, GROUP_BLUES_HOUSE, MAP_BLUES_HOUSE warp_def $b, $c, 1, GROUP_OAKS_LAB, MAP_OAKS_LAB - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 signpost 9, 7, SIGNPOST_READ, PalletTownSign signpost 5, 3, SIGNPOST_READ, RedsHouseSign signpost 13, 13, SIGNPOST_READ, OaksLabSign signpost 5, 11, SIGNPOST_READ, BluesHouseSign - ; people-events +.PersonEvents: db 2 person_event SPRITE_TEACHER, 12, 7, OW_DOWN | $2, $22, -1, -1, $0, 0, TeacherScript_0x1ac6d5, -1 person_event SPRITE_FISHER, 18, 16, OW_UP | $1, $2, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1ac6d8, -1 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 30f6c1f67..3537949a5 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -1,8 +1,8 @@ PewterCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -151,7 +151,7 @@ PewterCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $d, $1d, 1, GROUP_PEWTER_NIDORAN_SPEECH_HOUSE, MAP_PEWTER_NIDORAN_SPEECH_HOUSE warp_def $11, $10, 1, GROUP_PEWTER_GYM, MAP_PEWTER_GYM @@ -159,10 +159,10 @@ PewterCity_MapEventHeader: warp_def $19, $d, 1, GROUP_PEWTER_POKECENTER_1F, MAP_PEWTER_POKECENTER_1F warp_def $1d, $7, 1, GROUP_PEWTER_SNOOZE_SPEECH_HOUSE, MAP_PEWTER_SNOOZE_SPEECH_HOUSE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 7 signpost 23, 25, SIGNPOST_READ, PewterCitySign signpost 17, 11, SIGNPOST_READ, PewterGymSign @@ -172,7 +172,7 @@ PewterCity_MapEventHeader: signpost 25, 14, SIGNPOST_READ, PewterCityPokeCenterSign signpost 17, 24, SIGNPOST_READ, PewterCityMartSign - ; people-events +.PersonEvents: db 5 person_event SPRITE_COOLTRAINER_F, 15, 23, OW_DOWN | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x18c009, -1 person_event SPRITE_BUG_CATCHER, 33, 18, OW_DOWN | $2, $22, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x18c00c, -1 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index ec2928b6d..7737c0a64 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -1,8 +1,8 @@ PewterGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 BrockScript_0x1a2864: @@ -207,20 +207,20 @@ PewterGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $d, $4, 2, GROUP_PEWTER_CITY, MAP_PEWTER_CITY warp_def $d, $5, 2, GROUP_PEWTER_CITY, MAP_PEWTER_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 11, 2, SIGNPOST_READ, PewterGymStatue signpost 11, 7, SIGNPOST_READ, PewterGymStatue - ; people-events +.PersonEvents: db 3 person_event SPRITE_BROCK, 5, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BrockScript_0x1a2864, -1 person_event SPRITE_YOUNGSTER, 9, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerCamperJerry, -1 diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index 1c8dd56c3..b5f172010 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -1,8 +1,8 @@ PewterMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x1a2dcb: @@ -44,18 +44,18 @@ PewterMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_PEWTER_CITY, MAP_PEWTER_CITY warp_def $7, $3, 3, GROUP_PEWTER_CITY, MAP_PEWTER_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x1a2dcb, -1 person_event SPRITE_YOUNGSTER, 6, 13, OW_UP | $1, $2, -1, -1, $0, 0, YoungsterScript_0x1a2dd2, -1 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 0cbdd1f1d..a81ded4fa 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -1,8 +1,8 @@ PewterNidoranSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SuperNerdScript_0x1a2807: @@ -28,18 +28,18 @@ PewterNidoranSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_PEWTER_CITY, MAP_PEWTER_CITY warp_def $7, $3, 1, GROUP_PEWTER_CITY, MAP_PEWTER_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_SUPER_NERD, 9, 7, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x1a2807, -1 person_event SPRITE_GROWLITHE, 9, 8, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrowlitheScript_0x1a280a, -1 diff --git a/maps/PewterPokeCEnter2FBeta.asm b/maps/PewterPokeCEnter2FBeta.asm index 51202764f..5756d3d8d 100644 --- a/maps/PewterPokeCEnter2FBeta.asm +++ b/maps/PewterPokeCEnter2FBeta.asm @@ -1,23 +1,23 @@ PewterPokeCEnter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PewterPokeCEnter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_PEWTER_POKECENTER_1F, MAP_PEWTER_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm index 3f228e47d..b55fd7c44 100644 --- a/maps/PewterPokeCenter1F.asm +++ b/maps/PewterPokeCenter1F.asm @@ -1,8 +1,8 @@ PewterPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x1a2ee7: @@ -64,19 +64,19 @@ PewterPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 4, GROUP_PEWTER_CITY, MAP_PEWTER_CITY warp_def $7, $4, 4, GROUP_PEWTER_CITY, MAP_PEWTER_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 5 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x1a2ee7, -1 person_event SPRITE_TEACHER, 10, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x1a2eea, -1 diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 32c7f811d..72821d4b6 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -1,8 +1,8 @@ PewterSnoozeSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GrampsScript_0x1a3059: @@ -21,19 +21,19 @@ PewterSnoozeSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 5, GROUP_PEWTER_CITY, MAP_PEWTER_CITY warp_def $7, $3, 5, GROUP_PEWTER_CITY, MAP_PEWTER_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, PewterSnoozeSpeechHouseBookshelf signpost 1, 1, SIGNPOST_READ, PewterSnoozeSpeechHouseBookshelf - ; people-events +.PersonEvents: db 1 person_event SPRITE_GRAMPS, 7, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x1a3059, -1 diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 531420604..ed4636921 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -1,5 +1,5 @@ PokeCenter2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 6 ; triggers @@ -10,7 +10,7 @@ PokeCenter2F_MapScriptHeader: dw .Trigger5, $0000 dw .Trigger6, $0000 - ; callback count +.MapCallbacks: db 0 .Trigger1: @@ -1022,7 +1022,7 @@ PokeCenter2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $7, $0, -1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F warp_def $0, $5, 1, GROUP_TRADE_CENTER, MAP_TRADE_CENTER @@ -1031,14 +1031,14 @@ PokeCenter2F_MapEventHeader: warp_def $0, $6, 1, GROUP_MOBILE_TRADE_ROOM_MOBILE, MAP_MOBILE_TRADE_ROOM_MOBILE warp_def $0, $a, 1, GROUP_MOBILE_BATTLE_ROOM, MAP_MOBILE_BATTLE_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 3, 7, SIGNPOST_READ, MapPokeCenter2FSignpost0Script - ; people-events +.PersonEvents: db 4 person_event SPRITE_LINK_RECEPTIONIST, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LinkReceptionistScript_Trade, -1 person_event SPRITE_LINK_RECEPTIONIST, 6, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LinkReceptionistScript_Battle, -1 diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 5709555a3..0d4a288a0 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -1,8 +1,8 @@ PokeSeersHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SeerScript: @@ -17,17 +17,17 @@ PokeSeersHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 7, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY warp_def $7, $3, 7, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_GRANNY, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SeerScript, -1 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 2e4cbf3d6..c88c6bdc0 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -1,8 +1,8 @@ PokemonFanClub_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GentlemanScript_0x1917e9: @@ -292,20 +292,20 @@ PokemonFanClub_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $7, $3, 3, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 0, 7, SIGNPOST_READ, MapPokemonFanClubSignpost0Script signpost 0, 9, SIGNPOST_READ, MapPokemonFanClubSignpost1Script - ; people-events +.PersonEvents: db 6 person_event SPRITE_GENTLEMAN, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, GentlemanScript_0x1917e9, -1 person_event SPRITE_RECEPTIONIST, 5, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x191821, -1 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 753b5abcc..ee45ddcf1 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -1,12 +1,12 @@ PowerPlant_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x188dc3, $0000 dw UnknownScript_0x188dc4, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x188dc3: @@ -385,21 +385,21 @@ PowerPlant_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $11, $2, 2, GROUP_ROUTE_10_NORTH, MAP_ROUTE_10_NORTH warp_def $11, $3, 2, GROUP_ROUTE_10_NORTH, MAP_ROUTE_10_NORTH - ; xy triggers +.XYTriggers: db 1 xy_trigger 1, $c, $5, $0, UnknownScript_0x188dc5, $0, $0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, PowerPlantBookshelf signpost 1, 1, SIGNPOST_READ, PowerPlantBookshelf - ; people-events +.PersonEvents: db 7 person_event SPRITE_OFFICER, 18, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x188df5, -1 person_event SPRITE_GYM_GUY, 13, 6, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x188e15, -1 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 7b6eca2b9..27e9e8391 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -1,8 +1,8 @@ RadioTower1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ReceptionistScript_0x5cd29: @@ -468,21 +468,21 @@ RadioTower1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $2, 11, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $3, 11, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $0, $f, 2, GROUP_RADIO_TOWER_2F, MAP_RADIO_TOWER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 0, 3, SIGNPOST_READ, MapRadioTower1FSignpost0Script signpost 0, 13, SIGNPOST_READ, MapRadioTower1FSignpost1Script - ; people-events +.PersonEvents: db 6 person_event SPRITE_RECEPTIONIST, 10, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x5cd29, -1 person_event SPRITE_LASS, 8, 20, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, LassScript_0x5ce51, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 6d24b35c4..e5ec9dfee 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -1,8 +1,8 @@ RadioTower2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x5d6fd: @@ -701,15 +701,15 @@ RadioTower2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $0, $0, 1, GROUP_RADIO_TOWER_3F, MAP_RADIO_TOWER_3F warp_def $0, $f, 3, GROUP_RADIO_TOWER_1F, MAP_RADIO_TOWER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 signpost 0, 3, SIGNPOST_READ, MapRadioTower2FSignpost0Script signpost 0, 5, SIGNPOST_READ, MapRadioTower2FSignpost1Script @@ -718,7 +718,7 @@ RadioTower2F_MapEventHeader: signpost 1, 11, SIGNPOST_READ, RadioTower2FBookshelf signpost 0, 13, SIGNPOST_READ, MapRadioTower2FSignpost5Script - ; people-events +.PersonEvents: db 11 person_event SPRITE_SUPER_NERD, 10, 10, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x5d6fe, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_TEACHER, 6, 21, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, TeacherScript_0x5d701, -1 diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 42e9c70af..17abebca7 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -1,8 +1,8 @@ RadioTower3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -326,22 +326,22 @@ RadioTower3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $0, 1, GROUP_RADIO_TOWER_2F, MAP_RADIO_TOWER_2F warp_def $0, $7, 2, GROUP_RADIO_TOWER_4F, MAP_RADIO_TOWER_4F warp_def $0, $11, 4, GROUP_RADIO_TOWER_4F, MAP_RADIO_TOWER_4F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 0, 3, SIGNPOST_READ, MapRadioTower3FSignpost0Script signpost 0, 9, SIGNPOST_READ, MapRadioTower3FSignpost1Script signpost 2, 14, SIGNPOST_UP, MapRadioTower3FSignpost2Script - ; people-events +.PersonEvents: db 7 person_event SPRITE_SUPER_NERD, 8, 11, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x5e553, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_GYM_GUY, 8, 7, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GymGuyScript_0x5e556, -1 diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 59d73584f..4981214bf 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -1,8 +1,8 @@ RadioTower4F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FisherScript_0x5eb82: @@ -240,22 +240,22 @@ RadioTower4F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $0, 1, GROUP_RADIO_TOWER_5F, MAP_RADIO_TOWER_5F warp_def $0, $9, 2, GROUP_RADIO_TOWER_3F, MAP_RADIO_TOWER_3F warp_def $0, $c, 2, GROUP_RADIO_TOWER_5F, MAP_RADIO_TOWER_5F warp_def $0, $11, 3, GROUP_RADIO_TOWER_3F, MAP_RADIO_TOWER_3F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 0, 7, SIGNPOST_READ, MapRadioTower4FSignpost0Script signpost 0, 15, SIGNPOST_READ, MapRadioTower4FSignpost1Script - ; people-events +.PersonEvents: db 7 person_event SPRITE_FISHER, 8, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x5eb82, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_TEACHER, 10, 18, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x5eb85, -1 diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index bc245c964..b435e6a80 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -1,5 +1,5 @@ RadioTower5F_MapScriptHeader: - ; trigger count +.MapTriggers: db 3 ; triggers @@ -7,7 +7,7 @@ RadioTower5F_MapScriptHeader: dw UnknownScript_0x6000f, $0000 dw UnknownScript_0x60010, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x6000e: @@ -419,17 +419,17 @@ RadioTower5F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $0, $0, 1, GROUP_RADIO_TOWER_4F, MAP_RADIO_TOWER_4F warp_def $0, $c, 3, GROUP_RADIO_TOWER_4F, MAP_RADIO_TOWER_4F - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $3, $0, $0, UnknownScript_0x60011, $0, $0 xy_trigger 1, $5, $10, $0, UnknownScript_0x6006e, $0, $0 - ; signposts +.Signposts: db 5 signpost 0, 3, SIGNPOST_READ, MapRadioTower5FSignpost0Script signpost 0, 11, SIGNPOST_READ, MapRadioTower5FSignpost2Script @@ -437,7 +437,7 @@ RadioTower5F_MapEventHeader: signpost 1, 16, SIGNPOST_READ, RadioTower5FBookshelf signpost 1, 17, SIGNPOST_READ, RadioTower5FBookshelf - ; people-events +.PersonEvents: db 5 person_event SPRITE_GENTLEMAN, 10, 7, OW_DOWN | $3, $0, -1, -1, $0, 0, Director, -1 person_event SPRITE_ROCKET, 9, 17, OW_LEFT | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 1ca96d5b6..3de913163 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -1,11 +1,11 @@ RedsHouse1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw .Trigger, $0000 - ; callback count +.MapCallbacks: db 0 .Trigger @@ -77,21 +77,21 @@ RedsHouse1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $2, 1, GROUP_PALLET_TOWN, MAP_PALLET_TOWN warp_def $7, $3, 1, GROUP_PALLET_TOWN, MAP_PALLET_TOWN warp_def $0, $7, 1, GROUP_REDS_HOUSE_2F, MAP_REDS_HOUSE_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 1, 0, SIGNPOST_READ, RedsHouse1FBookshelf signpost 1, 1, SIGNPOST_READ, RedsHouse1FBookshelf signpost 1, 2, SIGNPOST_READ, RedsHouse1FTV - ; people-events +.PersonEvents: db 1 person_event SPRITE_REDS_MOM, 7, 9, OW_LEFT | $0, $0, -1, -1, $0, 0, RedsMom, -1 diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index 9ad02e96a..895288e0a 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -1,8 +1,8 @@ RedsHouse2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MapRedsHouse2FSignpost0Script: @@ -29,17 +29,17 @@ RedsHouse2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $0, $7, 3, GROUP_REDS_HOUSE_1F, MAP_REDS_HOUSE_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 5, 3, SIGNPOST_READ, MapRedsHouse2FSignpost0Script signpost 1, 0, SIGNPOST_READ, MapRedsHouse2FSignpost1Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 1745243e0..3eeeb7a18 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -1,8 +1,8 @@ RockTunnel1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x743b5: @@ -23,7 +23,7 @@ RockTunnel1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $3, $f, 1, GROUP_ROUTE_9, MAP_ROUTE_9 warp_def $19, $b, 1, GROUP_ROUTE_10_SOUTH, MAP_ROUTE_10_SOUTH @@ -32,15 +32,15 @@ RockTunnel1F_MapEventHeader: warp_def $3, $1b, 4, GROUP_ROCK_TUNNEL_B1F, MAP_ROCK_TUNNEL_B1F warp_def $d, $1b, 1, GROUP_ROCK_TUNNEL_B1F, MAP_ROCK_TUNNEL_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 4, 24, SIGNPOST_ITEM, MapRockTunnel1FSignpostItem0 signpost 15, 21, SIGNPOST_ITEM, MapRockTunnel1FSignpostItem1 - ; people-events +.PersonEvents: db 2 person_event SPRITE_POKE_BALL, 22, 8, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x743b5, EVENT_ROCK_TUNNEL_1F_ELIXER person_event SPRITE_POKE_BALL, 19, 14, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x743b7, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 00f13008e..74b1aac1a 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -1,8 +1,8 @@ RockTunnelB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x74409: @@ -22,21 +22,21 @@ RockTunnelB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $3, $3, 6, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F warp_def $9, $11, 4, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F warp_def $3, $17, 3, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F warp_def $17, $19, 5, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 14, 4, SIGNPOST_ITEM, MapRockTunnelB1FSignpostItem0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_POKE_BALL, 29, 11, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x74409, EVENT_ROCK_TUNNEL_B1F_IRON person_event SPRITE_POKE_BALL, 21, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7440b, EVENT_ROCK_TUNNEL_B1F_PP_UP diff --git a/maps/Route1.asm b/maps/Route1.asm index deeb0a104..b6a76b7b6 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -1,8 +1,8 @@ Route1_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerSchoolboyDanny: @@ -79,17 +79,17 @@ Route1_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 0 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 27, 7, SIGNPOST_READ, MapRoute1Signpost0Script - ; people-events +.PersonEvents: db 3 person_event SPRITE_YOUNGSTER, 16, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSchoolboyDanny, -1 person_event SPRITE_COOLTRAINER_F, 29, 13, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainerfQuinn, -1 diff --git a/maps/Route10North.asm b/maps/Route10North.asm index 19106b3c3..a8a1eb85a 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -1,8 +1,8 @@ Route10North_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PowerPlantSign: @@ -19,18 +19,18 @@ Route10North_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $1, $b, 1, GROUP_ROUTE_10_POKECENTER_1F, MAP_ROUTE_10_POKECENTER_1F warp_def $9, $3, 1, GROUP_POWER_PLANT, MAP_POWER_PLANT - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 11, 5, SIGNPOST_READ, PowerPlantSign signpost 1, 12, SIGNPOST_READ, Route10PokeCenterSign - ; people-events +.PersonEvents: db 0 diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm index 8a9a3f6e4..20a17a426 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10PokeCenter1F.asm @@ -1,8 +1,8 @@ Route10PokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x188bd4: @@ -78,19 +78,19 @@ Route10PokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_ROUTE_10_NORTH, MAP_ROUTE_10_NORTH warp_def $7, $4, 1, GROUP_ROUTE_10_NORTH, MAP_ROUTE_10_NORTH warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x188bd4, -1 person_event SPRITE_GENTLEMAN, 10, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x188bd7, -1 diff --git a/maps/Route10PokeCenter2FBeta.asm b/maps/Route10PokeCenter2FBeta.asm index 33e4a3bf1..92257396a 100644 --- a/maps/Route10PokeCenter2FBeta.asm +++ b/maps/Route10PokeCenter2FBeta.asm @@ -1,23 +1,23 @@ Route10PokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 Route10PokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_ROUTE_10_POKECENTER_1F, MAP_ROUTE_10_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 97b06f1fc..764a8b715 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -1,8 +1,8 @@ Route10South_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerHikerJim: @@ -75,18 +75,18 @@ Route10South_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $1, $6, 2, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 3, 5, SIGNPOST_READ, MapRoute10SouthSignpost0Script - ; people-events +.PersonEvents: db 2 person_event SPRITE_POKEFAN_M, 7, 21, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerJim, -1 person_event SPRITE_POKEFAN_M, 14, 12, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmRobert, -1 diff --git a/maps/Route11.asm b/maps/Route11.asm index 1cb84fd0b..7b15b0d97 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -1,8 +1,8 @@ Route11_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerYoungsterOwen: @@ -143,18 +143,18 @@ Route11_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 0 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 7, 3, SIGNPOST_READ, MapRoute11Signpost0Script signpost 5, 32, SIGNPOST_ITEM, MapRoute11SignpostItem1 - ; people-events +.PersonEvents: db 5 person_event SPRITE_YOUNGSTER, 18, 26, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterOwen, -1 person_event SPRITE_YOUNGSTER, 8, 24, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterJason, -1 diff --git a/maps/Route12.asm b/maps/Route12.asm index e9f40120c..8a481791c 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -1,8 +1,8 @@ Route12_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerFisherKyle: @@ -163,20 +163,20 @@ Route12_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $21, $b, 1, GROUP_ROUTE_12_SUPER_ROD_HOUSE, MAP_ROUTE_12_SUPER_ROD_HOUSE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 27, 11, SIGNPOST_READ, MapRoute12Signpost0Script signpost 9, 13, SIGNPOST_READ, MapRoute12Signpost1Script signpost 13, 14, SIGNPOST_ITEM, MapRoute12SignpostItem2 - ; people-events +.PersonEvents: db 6 person_event SPRITE_FISHER, 17, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherMartin, -1 person_event SPRITE_FISHER, 27, 18, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherStephen, -1 diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index fb7a44f30..2b84b5b46 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -1,8 +1,8 @@ Route12SuperRodHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FishingGuruScript_0x7f484: @@ -80,17 +80,17 @@ Route12SuperRodHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_ROUTE_12, MAP_ROUTE_12 warp_def $7, $3, 1, GROUP_ROUTE_12, MAP_ROUTE_12 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_FISHING_GURU, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FishingGuruScript_0x7f484, -1 diff --git a/maps/Route13.asm b/maps/Route13.asm index 57a51ea57..a2a52fd76 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -1,8 +1,8 @@ Route13_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerPokefanmAlex: @@ -189,20 +189,20 @@ Route13_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 0 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 signpost 13, 29, SIGNPOST_READ, MapRoute13Signpost0Script signpost 11, 41, SIGNPOST_READ, MapRoute13Signpost1Script signpost 13, 17, SIGNPOST_READ, MapRoute13Signpost2Script signpost 13, 30, SIGNPOST_ITEM, MapRoute13SignpostItem3 - ; people-events +.PersonEvents: db 5 person_event SPRITE_YOUNGSTER, 10, 46, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerBird_keeperPerry, -1 person_event SPRITE_YOUNGSTER, 10, 47, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerBird_keeperBret, -1 diff --git a/maps/Route14.asm b/maps/Route14.asm index abbec0a47..782c1257b 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -1,8 +1,8 @@ Route14_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x1ad47f: @@ -113,16 +113,16 @@ Route14_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 0 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_POKEFAN_M, 19, 15, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmCarter, -1 person_event SPRITE_YOUNGSTER, 31, 15, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperRoy, -1 diff --git a/maps/Route15.asm b/maps/Route15.asm index e683640d5..b9d37bb28 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -1,8 +1,8 @@ Route15_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerTeacherColette: @@ -196,19 +196,19 @@ Route15_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $4, $2, 3, GROUP_ROUTE_15_FUCHSIA_GATE, MAP_ROUTE_15_FUCHSIA_GATE warp_def $5, $2, 4, GROUP_ROUTE_15_FUCHSIA_GATE, MAP_ROUTE_15_FUCHSIA_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 9, 19, SIGNPOST_READ, MapRoute15Signpost0Script - ; people-events +.PersonEvents: db 7 person_event SPRITE_YOUNGSTER, 14, 14, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSchoolboyKipp, -1 person_event SPRITE_YOUNGSTER, 17, 19, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSchoolboyTommy, -1 diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index e8c5f9554..a5ff662fb 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -1,8 +1,8 @@ Route15FuchsiaGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x19679e: @@ -20,19 +20,19 @@ Route15FuchsiaGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 8, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $5, $0, 9, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $4, $9, 1, GROUP_ROUTE_15, MAP_ROUTE_15 warp_def $5, $9, 2, GROUP_ROUTE_15, MAP_ROUTE_15 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x19679e, -1 diff --git a/maps/Route16.asm b/maps/Route16.asm index 5214e4bb9..1f8306bc9 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -1,8 +1,8 @@ Route16_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -35,7 +35,7 @@ Route16_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $1, $3, 1, GROUP_ROUTE_16_FUCHSIA_SPEECH_HOUSE, MAP_ROUTE_16_FUCHSIA_SPEECH_HOUSE warp_def $6, $e, 3, GROUP_ROUTE_16_GATE, MAP_ROUTE_16_GATE @@ -43,12 +43,12 @@ Route16_MapEventHeader: warp_def $6, $9, 1, GROUP_ROUTE_16_GATE, MAP_ROUTE_16_GATE warp_def $7, $9, 2, GROUP_ROUTE_16_GATE, MAP_ROUTE_16_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 5, 5, SIGNPOST_READ, MapRoute16Signpost0Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 6cdcfd875..7fcfdc58b 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -1,8 +1,8 @@ Route16FuchsiaSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SuperNerdScript_0x73373: @@ -23,19 +23,19 @@ Route16FuchsiaSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_ROUTE_16, MAP_ROUTE_16 warp_def $7, $3, 1, GROUP_ROUTE_16, MAP_ROUTE_16 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, Route16FuchsiaSpeechHouseBookshelf signpost 1, 1, SIGNPOST_READ, Route16FuchsiaSpeechHouseBookshelf - ; people-events +.PersonEvents: db 1 person_event SPRITE_SUPER_NERD, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x73373, -1 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 44f362137..ba38719db 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -1,11 +1,11 @@ Route16Gate_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x733e9, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x733e9: @@ -63,21 +63,21 @@ Route16Gate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 4, GROUP_ROUTE_16, MAP_ROUTE_16 warp_def $5, $0, 5, GROUP_ROUTE_16, MAP_ROUTE_16 warp_def $4, $9, 2, GROUP_ROUTE_16, MAP_ROUTE_16 warp_def $5, $9, 3, GROUP_ROUTE_16, MAP_ROUTE_16 - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $4, $5, $0, UnknownScript_0x733ed, $0, $0 xy_trigger 0, $5, $5, $0, UnknownScript_0x733ed, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x733ea, -1 diff --git a/maps/Route17.asm b/maps/Route17.asm index 8b5f9557e..b9d7747e0 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -1,8 +1,8 @@ Route17_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -135,20 +135,20 @@ Route17_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $52, $11, 1, GROUP_ROUTE_17_18_GATE, MAP_ROUTE_17_18_GATE warp_def $53, $11, 2, GROUP_ROUTE_17_18_GATE, MAP_ROUTE_17_18_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 54, 9, SIGNPOST_ITEM, MapRoute17SignpostItem0 signpost 77, 8, SIGNPOST_ITEM, MapRoute17SignpostItem1 - ; people-events +.PersonEvents: db 4 person_event SPRITE_BIKER, 21, 8, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 4, TrainerBikerRiley, -1 person_event SPRITE_BIKER, 72, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerBikerJoel, -1 diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index ae945fe46..a44a09dc3 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -1,11 +1,11 @@ Route1718Gate_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x7360d, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x7360d: @@ -54,21 +54,21 @@ Route1718Gate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 1, GROUP_ROUTE_17, MAP_ROUTE_17 warp_def $5, $0, 2, GROUP_ROUTE_17, MAP_ROUTE_17 warp_def $4, $9, 1, GROUP_ROUTE_18, MAP_ROUTE_18 warp_def $5, $9, 2, GROUP_ROUTE_18, MAP_ROUTE_18 - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $4, $5, $0, UnknownScript_0x73611, $0, $0 xy_trigger 0, $5, $5, $0, UnknownScript_0x73611, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x7360e, -1 diff --git a/maps/Route18.asm b/maps/Route18.asm index 3255e23ca..fb3eea1e7 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -1,8 +1,8 @@ Route18_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBird_keeperBoris: @@ -77,19 +77,19 @@ Route18_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $6, $2, 3, GROUP_ROUTE_17_18_GATE, MAP_ROUTE_17_18_GATE warp_def $7, $2, 4, GROUP_ROUTE_17_18_GATE, MAP_ROUTE_17_18_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 5, 9, SIGNPOST_READ, MapRoute18Signpost0Script - ; people-events +.PersonEvents: db 2 person_event SPRITE_YOUNGSTER, 16, 13, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperBoris, -1 person_event SPRITE_YOUNGSTER, 10, 17, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperBob, -1 diff --git a/maps/Route19.asm b/maps/Route19.asm index 74fc39cc2..0ec9be135 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -1,8 +1,8 @@ Route19_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -233,19 +233,19 @@ Route19_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $3, $7, 3, GROUP_ROUTE_19___FUCHSIA_GATE, MAP_ROUTE_19___FUCHSIA_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 13, 11, SIGNPOST_READ, MapRoute19Signpost0Script signpost 1, 11, SIGNPOST_READ, MapRoute19Signpost1Script - ; people-events +.PersonEvents: db 6 person_event SPRITE_SWIMMER_GIRL, 27, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerSwimmerfDawn, -1 person_event SPRITE_SWIMMER_GUY, 32, 17, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermHarold, -1 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 6c591b599..83559633e 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -1,8 +1,8 @@ Route19FuchsiaGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x1ab3f6: @@ -46,19 +46,19 @@ Route19FuchsiaGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 10, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $0, $5, 11, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $7, $4, 1, GROUP_ROUTE_19, MAP_ROUTE_19 warp_def $7, $5, 1, GROUP_ROUTE_19, MAP_ROUTE_19 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x1ab3f6, -1 diff --git a/maps/Route2.asm b/maps/Route2.asm index 1cc5b9911..2fb81e3f8 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -1,8 +1,8 @@ Route2_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBug_catcherRob: @@ -140,7 +140,7 @@ Route2_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $f, $f, 1, GROUP_ROUTE_2_NUGGET_SPEECH_HOUSE, MAP_ROUTE_2_NUGGET_SPEECH_HOUSE warp_def $1f, $f, 3, GROUP_ROUTE_2_GATE, MAP_ROUTE_2_GATE @@ -148,10 +148,10 @@ Route2_MapEventHeader: warp_def $1b, $11, 2, GROUP_ROUTE_2_GATE, MAP_ROUTE_2_GATE warp_def $7, $c, 3, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 signpost 51, 7, SIGNPOST_READ, MapRoute2Signpost0Script signpost 9, 11, SIGNPOST_READ, MapRoute2Signpost1Script @@ -160,7 +160,7 @@ Route2_MapEventHeader: signpost 27, 4, SIGNPOST_ITEM, MapRoute2SignpostItem4 signpost 30, 11, SIGNPOST_ITEM, MapRoute2SignpostItem5 - ; people-events +.PersonEvents: db 8 person_event SPRITE_BUG_CATCHER, 49, 14, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 5, TrainerBug_catcherRob, -1 person_event SPRITE_BUG_CATCHER, 8, 10, OW_RIGHT | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherEd, -1 diff --git a/maps/Route20.asm b/maps/Route20.asm index 78f55b6de..4f90a042f 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -1,8 +1,8 @@ Route20_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -114,18 +114,18 @@ Route20_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $26, 1, GROUP_SEAFOAM_GYM, MAP_SEAFOAM_GYM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 11, 37, SIGNPOST_READ, MapRoute20Signpost0Script - ; people-events +.PersonEvents: db 3 person_event SPRITE_SWIMMER_GIRL, 12, 56, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfNicole, -1 person_event SPRITE_SWIMMER_GIRL, 17, 49, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfLori, -1 diff --git a/maps/Route21.asm b/maps/Route21.asm index b83c6ce6e..2d7f18b21 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -1,8 +1,8 @@ Route21_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerSwimmermSeth: @@ -88,16 +88,16 @@ Route21_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 0 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_SWIMMER_GIRL, 20, 15, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfNikki, -1 person_event SPRITE_SWIMMER_GUY, 34, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerSwimmermSeth, -1 diff --git a/maps/Route22.asm b/maps/Route22.asm index 4aae8a738..60d82f4f0 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -1,8 +1,8 @@ Route22_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MapRoute22Signpost0Script: @@ -19,16 +19,16 @@ Route22_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $5, $d, 1, GROUP_VICTORY_ROAD_GATE, MAP_VICTORY_ROAD_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 7, 15, SIGNPOST_READ, MapRoute22Signpost0Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/Route23.asm b/maps/Route23.asm index 3bc0ff78e..900b8186e 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -1,8 +1,8 @@ Route23_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -28,19 +28,19 @@ Route23_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $5, $9, 1, GROUP_INDIGO_PLATEAU_POKECENTER_1F, MAP_INDIGO_PLATEAU_POKECENTER_1F warp_def $5, $a, 2, GROUP_INDIGO_PLATEAU_POKECENTER_1F, MAP_INDIGO_PLATEAU_POKECENTER_1F warp_def $d, $9, 10, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD warp_def $d, $a, 10, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 7, 11, SIGNPOST_READ, IndigoPlateauSign - ; people-events +.PersonEvents: db 0 diff --git a/maps/Route24.asm b/maps/Route24.asm index 693efa355..4275c53a5 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -1,8 +1,8 @@ Route24_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 RocketScript_0x1adbfa: @@ -119,15 +119,15 @@ Route24_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 0 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_ROCKET, 11, 12, OW_DOWN | $3, $0, -1, -1, $0, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET diff --git a/maps/Route25.asm b/maps/Route25.asm index 0e8ccbaf5..0a1803b0a 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -1,12 +1,12 @@ Route25_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x19ee9e, $0000 dw UnknownScript_0x19ee9f, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x19ee9e: @@ -423,21 +423,21 @@ Route25_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $5, $2f, 1, GROUP_BILLS_HOUSE, MAP_BILLS_HOUSE - ; xy triggers +.XYTriggers: db 2 xy_trigger 1, $6, $2a, $0, UnknownScript_0x19eea0, $0, $0 xy_trigger 1, $7, $2a, $0, UnknownScript_0x19eee0, $0, $0 - ; signposts +.Signposts: db 2 signpost 5, 45, SIGNPOST_READ, MapRoute25Signpost0Script signpost 5, 4, SIGNPOST_ITEM, MapRoute25SignpostItem1 - ; people-events +.PersonEvents: db 11 person_event SPRITE_MISTY, 13, 50, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND person_event SPRITE_COOLTRAINER_M, 14, 50, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND diff --git a/maps/Route26.asm b/maps/Route26.asm index 1ffa4cf46..b6f5ebab6 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -1,8 +1,8 @@ Route26_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerCooltrainermJake: @@ -406,20 +406,20 @@ Route26_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $5, $7, 3, GROUP_VICTORY_ROAD_GATE, MAP_VICTORY_ROAD_GATE warp_def $39, $f, 1, GROUP_ROUTE_26_HEAL_SPEECH_HOUSE, MAP_ROUTE_26_HEAL_SPEECH_HOUSE warp_def $47, $5, 1, GROUP_ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, MAP_ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 6, 8, SIGNPOST_READ, MapRoute26Signpost0Script - ; people-events +.PersonEvents: db 8 person_event SPRITE_COOLTRAINER_M, 28, 18, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainermJake, -1 person_event SPRITE_COOLTRAINER_M, 42, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermGaven3, -1 diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm index a90c3284a..10260ba7c 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/Route26DayofWeekSiblingsHouse.asm @@ -1,8 +1,8 @@ Route26DayofWeekSiblingsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokedexScript_0x7b1e4: @@ -71,17 +71,17 @@ Route26DayofWeekSiblingsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_ROUTE_26, MAP_ROUTE_26 warp_def $7, $3, 3, GROUP_ROUTE_26, MAP_ROUTE_26 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_POKEDEX, 7, 7, OW_DOWN | $1, $0, -1, -1, $0, 0, PokedexScript_0x7b1e4, -1 diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index 366c67125..267802ef4 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -1,8 +1,8 @@ Route26HealSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x7b125: @@ -49,19 +49,19 @@ Route26HealSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_ROUTE_26, MAP_ROUTE_26 warp_def $7, $3, 2, GROUP_ROUTE_26, MAP_ROUTE_26 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, Route26HealHouseBookshelf signpost 1, 1, SIGNPOST_READ, Route26HealHouseBookshelf - ; people-events +.PersonEvents: db 1 person_event SPRITE_TEACHER, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x7b125, -1 diff --git a/maps/Route27.asm b/maps/Route27.asm index 8f40b1133..9d6f7dca6 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -1,12 +1,12 @@ Route27_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x1a0871, $0000 dw UnknownScript_0x1a0872, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x1a0871: @@ -462,22 +462,22 @@ Route27_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $21, 1, GROUP_ROUTE_27_SANDSTORM_HOUSE, MAP_ROUTE_27_SANDSTORM_HOUSE warp_def $5, $1a, 1, GROUP_TOHJO_FALLS, MAP_TOHJO_FALLS warp_def $5, $24, 2, GROUP_TOHJO_FALLS, MAP_TOHJO_FALLS - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $a, $12, $0, UnknownScript_0x1a0873, $0, $0 xy_trigger 0, $a, $13, $0, UnknownScript_0x1a0881, $0, $0 - ; signposts +.Signposts: db 1 signpost 7, 25, SIGNPOST_READ, MapRoute27Signpost0Script - ; people-events +.PersonEvents: db 9 person_event SPRITE_COOLTRAINER_M, 11, 52, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermBlake, -1 person_event SPRITE_COOLTRAINER_M, 10, 62, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerCooltrainermBrian, -1 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index e3779ff23..0b05f0ec4 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -1,8 +1,8 @@ Route27SandstormHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SandstormHouseWoman: @@ -94,19 +94,19 @@ Route27SandstormHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_ROUTE_27, MAP_ROUTE_27 warp_def $7, $3, 1, GROUP_ROUTE_27, MAP_ROUTE_27 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, SandstormHouseBookshelf signpost 1, 1, SIGNPOST_READ, SandstormHouseBookshelf - ; people-events +.PersonEvents: db 1 person_event SPRITE_GRANNY, 8, 6, OW_UP | $2, $0, -1, -1, $0, 0, SandstormHouseWoman, -1 diff --git a/maps/Route28.asm b/maps/Route28.asm index 192a0c65d..b32d030f0 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -1,8 +1,8 @@ Route28_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MapRoute28Signpost0Script: @@ -20,18 +20,18 @@ Route28_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $7, 1, GROUP_ROUTE_28_FAMOUS_SPEECH_HOUSE, MAP_ROUTE_28_FAMOUS_SPEECH_HOUSE warp_def $5, $21, 7, GROUP_VICTORY_ROAD_GATE, MAP_VICTORY_ROAD_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 5, 31, SIGNPOST_READ, MapRoute28Signpost0Script signpost 2, 25, SIGNPOST_ITEM, MapRoute28SignpostItem1 - ; people-events +.PersonEvents: db 0 diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index d331bf22e..ed9db8957 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -1,11 +1,11 @@ Route28FamousSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw .Trigger, $0000 - ; callback count +.MapCallbacks: db 0 .Trigger @@ -72,20 +72,20 @@ Route28FamousSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_ROUTE_28, MAP_ROUTE_28 warp_def $7, $3, 1, GROUP_ROUTE_28, MAP_ROUTE_28 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, CelebrityHouseBookshelf signpost 1, 1, SIGNPOST_READ, CelebrityHouseBookshelf - ; people-events +.PersonEvents: db 2 person_event SPRITE_COOLTRAINER_F, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, Celebrity, -1 person_event SPRITE_MOLTRES, 9, 10, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CelebritysFearow, -1 diff --git a/maps/Route29.asm b/maps/Route29.asm index 17564718d..8d5afd5fe 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -1,12 +1,12 @@ Route29_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x1a0f59, $0000 dw UnknownScript_0x1a0f5a, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -414,21 +414,21 @@ Route29_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $1, $1b, 3, GROUP_ROUTE_29_46_GATE, MAP_ROUTE_29_46_GATE - ; xy triggers +.XYTriggers: db 2 xy_trigger 1, $8, $35, $0, UnknownScript_0x1a0f6d, $0, $0 xy_trigger 1, $9, $35, $0, UnknownScript_0x1a0fa3, $0, $0 - ; signposts +.Signposts: db 2 signpost 7, 51, SIGNPOST_READ, MapRoute29Signpost0Script signpost 5, 3, SIGNPOST_READ, MapRoute29Signpost1Script - ; people-events +.PersonEvents: db 8 person_event SPRITE_COOLTRAINER_M, 16, 54, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x1a0ff1, -1 person_event SPRITE_YOUNGSTER, 20, 31, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1a1028, -1 diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm index ccdf9d3be..aeb67342a 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route2946Gate.asm @@ -1,8 +1,8 @@ Route2946Gate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x7b5bb: @@ -36,20 +36,20 @@ Route2946Gate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 1, GROUP_ROUTE_46, MAP_ROUTE_46 warp_def $0, $5, 2, GROUP_ROUTE_46, MAP_ROUTE_46 warp_def $7, $4, 1, GROUP_ROUTE_29, MAP_ROUTE_29 warp_def $7, $5, 1, GROUP_ROUTE_29, MAP_ROUTE_29 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x7b5bb, -1 person_event SPRITE_YOUNGSTER, 8, 10, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x7b5be, -1 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index ed7f2eedf..8a92a2cf6 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -1,8 +1,8 @@ Route2Gate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ScientistScript_0x9b952: @@ -26,19 +26,19 @@ Route2Gate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 3, GROUP_ROUTE_2, MAP_ROUTE_2 warp_def $0, $5, 4, GROUP_ROUTE_2, MAP_ROUTE_2 warp_def $7, $4, 2, GROUP_ROUTE_2, MAP_ROUTE_2 warp_def $7, $5, 2, GROUP_ROUTE_2, MAP_ROUTE_2 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_SCIENTIST, 8, 10, OW_UP | $0, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x9b952, -1 diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index c34a17f11..54e7f4433 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -1,8 +1,8 @@ Route2NuggetSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FisherScript_0x9b847: @@ -53,17 +53,17 @@ Route2NuggetSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_ROUTE_2, MAP_ROUTE_2 warp_def $7, $3, 1, GROUP_ROUTE_2, MAP_ROUTE_2 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_FISHER, 8, 6, OW_UP | $0, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x9b847, -1 diff --git a/maps/Route3.asm b/maps/Route3.asm index ef61f1d25..7db9dc951 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -1,8 +1,8 @@ Route3_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerFirebreatherOtis: @@ -130,18 +130,18 @@ Route3_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $1, $34, 1, GROUP_MOUNT_MOON, MAP_MOUNT_MOON - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 13, 49, SIGNPOST_READ, MapRoute3Signpost0Script - ; people-events +.PersonEvents: db 4 person_event SPRITE_FISHER, 16, 30, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerFirebreatherOtis, -1 person_event SPRITE_YOUNGSTER, 11, 14, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterWarren, -1 diff --git a/maps/Route30.asm b/maps/Route30.asm index 80f5fdc5a..5a7223183 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -1,8 +1,8 @@ Route30_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 YoungsterScript_0x1a1673: @@ -398,15 +398,15 @@ Route30_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $27, $7, 1, GROUP_ROUTE_30_BERRY_SPEECH_HOUSE, MAP_ROUTE_30_BERRY_SPEECH_HOUSE warp_def $5, $11, 1, GROUP_MR_POKEMONS_HOUSE, MAP_MR_POKEMONS_HOUSE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 5 signpost 43, 9, SIGNPOST_READ, MapRoute30Signpost0Script signpost 29, 13, SIGNPOST_READ, MapRoute30Signpost1Script @@ -414,7 +414,7 @@ Route30_MapEventHeader: signpost 21, 3, SIGNPOST_READ, MapRoute30Signpost3Script signpost 9, 14, SIGNPOST_ITEM, MapRoute30SignpostItem4 - ; people-events +.PersonEvents: db 11 person_event SPRITE_YOUNGSTER, 30, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x1a1673, EVENT_ROUTE_30_BATTLE person_event SPRITE_YOUNGSTER, 32, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index 81138b55c..23af447b0 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -1,8 +1,8 @@ Route30BerrySpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x196d64: @@ -47,19 +47,19 @@ Route30BerrySpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_ROUTE_30, MAP_ROUTE_30 warp_def $7, $3, 1, GROUP_ROUTE_30, MAP_ROUTE_30 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, Route30BerrySpeechHouseBookshelf signpost 1, 1, SIGNPOST_READ, Route30BerrySpeechHouseBookshelf - ; people-events +.PersonEvents: db 1 person_event SPRITE_POKEFAN_M, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x196d64, -1 diff --git a/maps/Route31.asm b/maps/Route31.asm index ed094af0f..1b48dfc24 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -1,8 +1,8 @@ Route31_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -414,21 +414,21 @@ Route31_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $6, $4, 3, GROUP_ROUTE_31_VIOLET_GATE, MAP_ROUTE_31_VIOLET_GATE warp_def $7, $4, 4, GROUP_ROUTE_31_VIOLET_GATE, MAP_ROUTE_31_VIOLET_GATE warp_def $5, $22, 1, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 5, 7, SIGNPOST_READ, MapRoute31Signpost0Script signpost 5, 31, SIGNPOST_READ, MapRoute31Signpost1Script - ; people-events +.PersonEvents: db 7 person_event SPRITE_FISHER, 11, 21, OW_UP | $2, $0, -1, -1, $0, 0, FisherScript_0x1a5570, -1 person_event SPRITE_YOUNGSTER, 9, 13, OW_DOWN | $2, $11, -1, -1, $0, 0, YoungsterScript_0x1a55ed, -1 diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 6ad33c0bf..032b0f141 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -1,8 +1,8 @@ Route31VioletGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x197634: @@ -27,20 +27,20 @@ Route31VioletGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 8, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $5, $0, 9, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $4, $9, 1, GROUP_ROUTE_31, MAP_ROUTE_31 warp_def $5, $9, 2, GROUP_ROUTE_31, MAP_ROUTE_31 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x197634, -1 person_event SPRITE_COOLTRAINER_F, 6, 5, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CooltrainerFScript_0x197637, -1 diff --git a/maps/Route32.asm b/maps/Route32.asm index 5db89a6ee..2a832897c 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -1,5 +1,5 @@ Route32_MapScriptHeader: - ; trigger count +.MapTriggers: db 3 ; triggers @@ -7,7 +7,7 @@ Route32_MapScriptHeader: dw UnknownScript_0x190461, $0000 dw UnknownScript_0x190462, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -923,19 +923,19 @@ Route32_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $49, $b, 1, GROUP_ROUTE_32_POKECENTER_1F, MAP_ROUTE_32_POKECENTER_1F warp_def $2, $4, 3, GROUP_ROUTE_32_RUINS_OF_ALPH_GATE, MAP_ROUTE_32_RUINS_OF_ALPH_GATE warp_def $3, $4, 4, GROUP_ROUTE_32_RUINS_OF_ALPH_GATE, MAP_ROUTE_32_RUINS_OF_ALPH_GATE warp_def $4f, $6, 4, GROUP_UNION_CAVE_1F, MAP_UNION_CAVE_1F - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $8, $12, $0, UnknownScript_0x1904ab, $0, $0 xy_trigger 1, $47, $7, $0, UnknownScript_0x1904e9, $0, $0 - ; signposts +.Signposts: db 6 signpost 5, 13, SIGNPOST_READ, Route32Sign signpost 1, 9, SIGNPOST_READ, Route32RuinsSign @@ -944,7 +944,7 @@ Route32_MapEventHeader: signpost 67, 12, SIGNPOST_ITEM, MapRoute32SignpostItem4 signpost 40, 11, SIGNPOST_ITEM, MapRoute32SignpostItem5 - ; people-events +.PersonEvents: db 14 person_event SPRITE_FISHER, 53, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherJustin, -1 person_event SPRITE_FISHER, 60, 16, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherRalph1, -1 diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm index 0a0af9278..a12d8e06e 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32PokeCenter1F.asm @@ -1,8 +1,8 @@ Route32PokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x69b52: @@ -93,19 +93,19 @@ Route32PokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_ROUTE_32, MAP_ROUTE_32 warp_def $7, $4, 1, GROUP_ROUTE_32, MAP_ROUTE_32 warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x69b52, -1 person_event SPRITE_FISHING_GURU, 8, 5, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FishingGuruScript_0x69b55, -1 diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm index 37533abe9..57ffd34bd 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -1,8 +1,8 @@ Route32RuinsofAlphGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x69a2d: @@ -45,20 +45,20 @@ Route32RuinsofAlphGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 10, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $5, $0, 11, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $4, $9, 2, GROUP_ROUTE_32, MAP_ROUTE_32 warp_def $5, $9, 3, GROUP_ROUTE_32, MAP_ROUTE_32 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x69a2d, -1 person_event SPRITE_POKEFAN_M, 6, 12, OW_UP | $0, $10, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x69a30, -1 diff --git a/maps/Route33.asm b/maps/Route33.asm index b457a1b1a..f71be809c 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -1,8 +1,8 @@ Route33_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 LassScript_0x1ac002: @@ -193,18 +193,18 @@ Route33_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $9, $b, 3, GROUP_UNION_CAVE_1F, MAP_UNION_CAVE_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 11, 11, SIGNPOST_READ, MapRoute33Signpost0Script - ; people-events +.PersonEvents: db 3 person_event SPRITE_POKEFAN_M, 17, 10, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerAnthony, -1 person_event SPRITE_LASS, 20, 17, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x1ac002, -1 diff --git a/maps/Route34.asm b/maps/Route34.asm index 04c8ee921..9ed7261bd 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -1,8 +1,8 @@ Route34_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -754,7 +754,7 @@ Route34_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $25, $d, 1, GROUP_ROUTE_34_ILEX_FOREST_GATE, MAP_ROUTE_34_ILEX_FOREST_GATE warp_def $25, $e, 2, GROUP_ROUTE_34_ILEX_FOREST_GATE, MAP_ROUTE_34_ILEX_FOREST_GATE @@ -762,10 +762,10 @@ Route34_MapEventHeader: warp_def $f, $b, 2, GROUP_DAYCARE, MAP_DAYCARE warp_def $f, $d, 3, GROUP_DAYCARE, MAP_DAYCARE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 5 signpost 6, 12, SIGNPOST_READ, MapRoute34Signpost0Script signpost 33, 13, SIGNPOST_READ, MapRoute34Signpost1Script @@ -773,7 +773,7 @@ Route34_MapEventHeader: signpost 32, 8, SIGNPOST_ITEM, MapRoute34SignpostItem3 signpost 19, 17, SIGNPOST_ITEM, MapRoute34SignpostItem4 - ; people-events +.PersonEvents: db 13 person_event SPRITE_YOUNGSTER, 11, 17, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 5, TrainerCamperTodd1, -1 person_event SPRITE_YOUNGSTER, 36, 19, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterSamuel, -1 diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 180110949..8b55d58d5 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -1,8 +1,8 @@ Route34IlexForestGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -136,21 +136,21 @@ Route34IlexForestGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 1, GROUP_ROUTE_34, MAP_ROUTE_34 warp_def $0, $5, 2, GROUP_ROUTE_34, MAP_ROUTE_34 warp_def $7, $4, 1, GROUP_ILEX_FOREST, MAP_ILEX_FOREST warp_def $7, $5, 1, GROUP_ILEX_FOREST, MAP_ILEX_FOREST - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $7, $4, $0, UnknownScript_0x62d3d, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_TEACHER, 7, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER person_event SPRITE_BUTTERFREE, 8, 13, OW_UP | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ButterfreeScript_0x62d8a, -1 diff --git a/maps/Route35.asm b/maps/Route35.asm index 5d642a89e..c2a483730 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -1,8 +1,8 @@ Route35_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBird_keeperBryan: @@ -453,21 +453,21 @@ Route35_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $21, $9, 1, GROUP_ROUTE_35_GOLDENROD_GATE, MAP_ROUTE_35_GOLDENROD_GATE warp_def $21, $a, 2, GROUP_ROUTE_35_GOLDENROD_GATE, MAP_ROUTE_35_GOLDENROD_GATE warp_def $5, $3, 3, GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 7, 1, SIGNPOST_READ, MapRoute35Signpost1Script signpost 31, 11, SIGNPOST_READ, MapRoute35Signpost1Script - ; people-events +.PersonEvents: db 11 person_event SPRITE_YOUNGSTER, 23, 8, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerCamperIvan, -1 person_event SPRITE_YOUNGSTER, 24, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerCamperElliot, -1 diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm index 959153f95..192e2673d 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35Goldenrodgate.asm @@ -1,8 +1,8 @@ Route35Goldenrodgate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x69d37: @@ -194,20 +194,20 @@ Route35Goldenrodgate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 1, GROUP_ROUTE_35, MAP_ROUTE_35 warp_def $0, $5, 2, GROUP_ROUTE_35, MAP_ROUTE_35 warp_def $7, $4, 12, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $5, 12, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x69d37, -1 person_event SPRITE_POKEFAN_F, 8, 10, OW_UP | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, PokefanFScript_0x69dc6, -1 diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index a604c681b..2d166ebe0 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -1,5 +1,5 @@ Route35NationalParkgate_MapScriptHeader: - ; trigger count +.MapTriggers: db 3 ; triggers @@ -7,7 +7,7 @@ Route35NationalParkgate_MapScriptHeader: dw Route35NationalParkgate_Trigger2, $0000 dw Route35NationalParkgate_Trigger3, $0000 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -442,21 +442,21 @@ Route35NationalParkgate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $3, 3, GROUP_NATIONAL_PARK, MAP_NATIONAL_PARK warp_def $0, $4, 4, GROUP_NATIONAL_PARK, MAP_NATIONAL_PARK warp_def $7, $3, 3, GROUP_ROUTE_35, MAP_ROUTE_35 warp_def $7, $4, 3, GROUP_ROUTE_35, MAP_ROUTE_35 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 0, 5, SIGNPOST_READ, MapRoute36NationalParkgateSignpost0Script - ; people-events +.PersonEvents: db 3 person_event SPRITE_OFFICER, 5, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY person_event SPRITE_YOUNGSTER, 9, 10, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6a2d8, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER diff --git a/maps/Route36.asm b/maps/Route36.asm index 2946e873f..517971e15 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -1,12 +1,12 @@ Route36_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x19400d, $0000 dw UnknownScript_0x19400e, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -658,26 +658,26 @@ Route36_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $8, $12, 3, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE warp_def $9, $12, 4, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE warp_def $d, $2f, 1, GROUP_ROUTE_36_RUINS_OF_ALPH_GATE, MAP_ROUTE_36_RUINS_OF_ALPH_GATE warp_def $d, $30, 2, GROUP_ROUTE_36_RUINS_OF_ALPH_GATE, MAP_ROUTE_36_RUINS_OF_ALPH_GATE - ; xy triggers +.XYTriggers: db 2 xy_trigger 1, $7, $14, $0, UnknownScript_0x19401b, $0, $0 xy_trigger 1, $7, $16, $0, UnknownScript_0x19401b, $0, $0 - ; signposts +.Signposts: db 4 signpost 1, 29, SIGNPOST_READ, MapRoute36Signpost0Script signpost 11, 45, SIGNPOST_READ, MapRoute36Signpost1Script signpost 7, 55, SIGNPOST_READ, MapRoute36Signpost2Script signpost 7, 21, SIGNPOST_READ, MapRoute36Signpost3Script - ; people-events +.PersonEvents: db 9 person_event SPRITE_YOUNGSTER, 17, 24, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPsychicMark, -1 person_event SPRITE_YOUNGSTER, 18, 35, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerSchoolboyAlan1, -1 diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index df4bc16d0..49a869255 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -1,5 +1,5 @@ Route36NationalParkgate_MapScriptHeader: - ; trigger count +.MapTriggers: db 3 ; triggers @@ -7,7 +7,7 @@ Route36NationalParkgate_MapScriptHeader: dw UnknownScript_0x6ab12, $0000 dw UnknownScript_0x6ab13, $0000 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -846,21 +846,21 @@ Route36NationalParkgate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 1, GROUP_NATIONAL_PARK, MAP_NATIONAL_PARK warp_def $5, $0, 2, GROUP_NATIONAL_PARK, MAP_NATIONAL_PARK warp_def $4, $9, 1, GROUP_ROUTE_36, MAP_ROUTE_36 warp_def $5, $9, 2, GROUP_ROUTE_36, MAP_ROUTE_36 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 0, 6, SIGNPOST_READ, MapRoute36NationalParkgateSignpost0Script - ; people-events +.PersonEvents: db 12 person_event SPRITE_OFFICER, 7, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6abe0, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY person_event SPRITE_YOUNGSTER, 9, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm index 57431297e..4854e7f8b 100644 --- a/maps/Route36RuinsofAlphgate.asm +++ b/maps/Route36RuinsofAlphgate.asm @@ -1,8 +1,8 @@ Route36RuinsofAlphgate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x6aa1a: @@ -34,20 +34,20 @@ Route36RuinsofAlphgate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 3, GROUP_ROUTE_36, MAP_ROUTE_36 warp_def $0, $5, 4, GROUP_ROUTE_36, MAP_ROUTE_36 warp_def $7, $4, 9, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $7, $5, 9, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x6aa1a, -1 person_event SPRITE_GRAMPS, 9, 11, OW_DOWN | $2, $21, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x6aa1d, -1 diff --git a/maps/Route37.asm b/maps/Route37.asm index 8c99c8d19..9ad9576b1 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -1,8 +1,8 @@ Route37_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -236,18 +236,18 @@ Route37_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 0 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 3, 5, SIGNPOST_READ, MapRoute37Signpost0Script signpost 2, 4, SIGNPOST_ITEM, MapRoute37SignpostItem1 - ; people-events +.PersonEvents: db 7 person_event SPRITE_WEIRD_TREE, 16, 10, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAnnandanne1, -1 person_event SPRITE_WEIRD_TREE, 16, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAnnandanne2, -1 diff --git a/maps/Route38.asm b/maps/Route38.asm index 6bd01280b..47b35d3bc 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -1,8 +1,8 @@ Route38_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBird_keeperToby: @@ -467,20 +467,20 @@ Route38_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $8, $23, 1, GROUP_ROUTE_38_ECRUTEAK_GATE, MAP_ROUTE_38_ECRUTEAK_GATE warp_def $9, $23, 2, GROUP_ROUTE_38_ECRUTEAK_GATE, MAP_ROUTE_38_ECRUTEAK_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 7, 33, SIGNPOST_READ, MapRoute38Signpost0Script signpost 13, 5, SIGNPOST_READ, MapRoute38Signpost1Script - ; people-events +.PersonEvents: db 7 person_event SPRITE_STANDING_YOUNGSTER, 5, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyChad1, -1 person_event SPRITE_LASS, 7, 19, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerLassDana1, -1 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index bef2b715e..f5cf4d418 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -1,8 +1,8 @@ Route38EcruteakGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x9cbd7: @@ -25,19 +25,19 @@ Route38EcruteakGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 1, GROUP_ROUTE_38, MAP_ROUTE_38 warp_def $5, $0, 2, GROUP_ROUTE_38, MAP_ROUTE_38 warp_def $4, $9, 14, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $5, $9, 15, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x9cbd7, -1 diff --git a/maps/Route39.asm b/maps/Route39.asm index 0e8a72964..76a2b4c55 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -1,8 +1,8 @@ Route39_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TaurosScript_0x1a5af5: @@ -336,22 +336,22 @@ Route39_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $1, 1, GROUP_ROUTE_39_BARN, MAP_ROUTE_39_BARN warp_def $3, $5, 1, GROUP_ROUTE_39_FARMHOUSE, MAP_ROUTE_39_FARMHOUSE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 signpost 31, 5, SIGNPOST_READ, MapRoute39Signpost0Script signpost 5, 9, SIGNPOST_READ, MapRoute39Signpost1Script signpost 7, 15, SIGNPOST_READ, MapRoute39Signpost2Script signpost 13, 5, SIGNPOST_ITEM, MapRoute39SignpostItem3 - ; people-events +.PersonEvents: db 10 person_event SPRITE_SAILOR, 33, 17, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerSailorEugene, -1 person_event SPRITE_POKEFAN_M, 26, 14, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerPokefanmDerek1, -1 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 980983633..11cab1d7f 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -1,8 +1,8 @@ Route39Barn_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TwinScript_0x9cc76: @@ -187,18 +187,18 @@ Route39Barn_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $3, 1, GROUP_ROUTE_39, MAP_ROUTE_39 warp_def $7, $4, 1, GROUP_ROUTE_39, MAP_ROUTE_39 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_TWIN, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, TwinScript_0x9cc76, -1 person_event SPRITE_TWIN, 7, 8, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x9cc90, -1 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index c54a313f9..2e43e5635 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -1,8 +1,8 @@ Route39Farmhouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x9ceb4: @@ -192,20 +192,20 @@ Route39Farmhouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_ROUTE_39, MAP_ROUTE_39 warp_def $7, $3, 2, GROUP_ROUTE_39, MAP_ROUTE_39 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, FarmhouseBookshelf signpost 1, 1, SIGNPOST_READ, FarmhouseBookshelf - ; people-events +.PersonEvents: db 2 person_event SPRITE_POKEFAN_M, 6, 7, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, PokefanMScript_0x9ceb4, -1 person_event SPRITE_POKEFAN_F, 8, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanFScript_0x9cf0e, -1 diff --git a/maps/Route4.asm b/maps/Route4.asm index b432f1196..df00a04c0 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -1,8 +1,8 @@ Route4_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBird_keeperHank: @@ -119,19 +119,19 @@ Route4_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $5, $2, 2, GROUP_MOUNT_MOON, MAP_MOUNT_MOON - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 7, 3, SIGNPOST_READ, MapRoute4Signpost0Script signpost 3, 10, SIGNPOST_ITEM, MapRoute4SignpostItem1 - ; people-events +.PersonEvents: db 4 person_event SPRITE_YOUNGSTER, 13, 21, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperHank, -1 person_event SPRITE_LASS, 12, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerPicnickerHope, -1 diff --git a/maps/Route40.asm b/maps/Route40.asm index d056520c4..6fd99ee3a 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -1,8 +1,8 @@ Route40_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -330,19 +330,19 @@ Route40_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $5, $9, 1, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 10, 14, SIGNPOST_READ, MapRoute40Signpost0Script signpost 8, 7, SIGNPOST_ITEM, MapRoute40SignpostItem1 - ; people-events +.PersonEvents: db 12 person_event SPRITE_OLIVINE_RIVAL, 19, 18, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerSwimmermSimon, -1 person_event SPRITE_OLIVINE_RIVAL, 34, 22, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerSwimmermRandall, -1 diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index c8cd6259e..f5905a9ba 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -1,8 +1,8 @@ Route40BattleTowerGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -73,20 +73,20 @@ Route40BattleTowerGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $7, $4, 1, GROUP_ROUTE_40, MAP_ROUTE_40 warp_def $7, $5, 1, GROUP_ROUTE_40, MAP_ROUTE_40 warp_def $0, $4, 1, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE warp_def $0, $5, 2, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_ROCKER, 7, 7, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, RockerScript_0x9f669, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR person_event SPRITE_TWIN, 9, 11, OW_UP | $0, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, TwinScript_0x9f66c, -1 diff --git a/maps/Route41.asm b/maps/Route41.asm index 962181ee4..a2fc0a74c 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -1,8 +1,8 @@ Route41_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerSwimmerfKaylee: @@ -333,21 +333,21 @@ Route41_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $11, $c, 1, GROUP_WHIRL_ISLAND_NW, MAP_WHIRL_ISLAND_NW warp_def $13, $24, 1, GROUP_WHIRL_ISLAND_NE, MAP_WHIRL_ISLAND_NE warp_def $25, $c, 1, GROUP_WHIRL_ISLAND_SW, MAP_WHIRL_ISLAND_SW warp_def $2d, $24, 1, GROUP_WHIRL_ISLAND_SE, MAP_WHIRL_ISLAND_SE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 35, 9, SIGNPOST_ITEM, MapRoute41SignpostItem0 - ; people-events +.PersonEvents: db 10 person_event SPRITE_OLIVINE_RIVAL, 10, 36, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermCharlie, -1 person_event SPRITE_OLIVINE_RIVAL, 12, 50, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermGeorge, -1 diff --git a/maps/Route42.asm b/maps/Route42.asm index 60be219ff..2ca42a7dc 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -1,12 +1,12 @@ Route42_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x1a9216, $0000 dw UnknownScript_0x1a9217, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x1a9216: @@ -314,7 +314,7 @@ Route42_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $8, $0, 3, GROUP_ROUTE_42_ECRUTEAK_GATE, MAP_ROUTE_42_ECRUTEAK_GATE warp_def $9, $0, 4, GROUP_ROUTE_42_ECRUTEAK_GATE, MAP_ROUTE_42_ECRUTEAK_GATE @@ -322,11 +322,11 @@ Route42_MapEventHeader: warp_def $9, $1c, 2, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE warp_def $7, $2e, 3, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE - ; xy triggers +.XYTriggers: db 1 xy_trigger 1, $e, $18, $0, UnknownScript_0x1a9218, $0, $0 - ; signposts +.Signposts: db 5 signpost 10, 4, SIGNPOST_READ, MapRoute42Signpost0Script signpost 5, 7, SIGNPOST_READ, MapRoute42Signpost1Script @@ -334,7 +334,7 @@ Route42_MapEventHeader: signpost 8, 54, SIGNPOST_READ, MapRoute42Signpost3Script signpost 11, 16, SIGNPOST_ITEM, MapRoute42SignpostItem4 - ; people-events +.PersonEvents: db 9 person_event SPRITE_FISHER, 14, 44, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherTully1, -1 person_event SPRITE_POKEFAN_M, 13, 55, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerBenjamin, -1 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index 8f5bfeede..4158ab230 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -1,8 +1,8 @@ Route42EcruteakGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x19a4b5: @@ -20,19 +20,19 @@ Route42EcruteakGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 1, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $5, $0, 2, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $4, $9, 1, GROUP_ROUTE_42, MAP_ROUTE_42 warp_def $5, $9, 2, GROUP_ROUTE_42, MAP_ROUTE_42 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x19a4b5, -1 diff --git a/maps/Route43.asm b/maps/Route43.asm index 3da26b21a..85799e520 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -1,8 +1,8 @@ Route43_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -497,7 +497,7 @@ Route43_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $33, $9, 1, GROUP_ROUTE_43_MAHOGANY_GATE, MAP_ROUTE_43_MAHOGANY_GATE warp_def $33, $a, 2, GROUP_ROUTE_43_MAHOGANY_GATE, MAP_ROUTE_43_MAHOGANY_GATE @@ -505,16 +505,16 @@ Route43_MapEventHeader: warp_def $1f, $11, 1, GROUP_ROUTE_43_GATE, MAP_ROUTE_43_GATE warp_def $1f, $12, 2, GROUP_ROUTE_43_GATE, MAP_ROUTE_43_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 3, 13, SIGNPOST_READ, MapRoute43Signpost0Script signpost 49, 11, SIGNPOST_READ, MapRoute43Signpost1Script signpost 38, 16, SIGNPOST_READ, MapRoute43Signpost2Script - ; people-events +.PersonEvents: db 8 person_event SPRITE_SUPER_NERD, 9, 17, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerPokemaniacBen, -1 person_event SPRITE_SUPER_NERD, 24, 17, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacBrent1, -1 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 69356c7a4..4ab30615a 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -1,12 +1,12 @@ Route43Gate_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x19abc5, $0000 dw UnknownScript_0x19abc9, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -249,20 +249,20 @@ Route43Gate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 4, GROUP_ROUTE_43, MAP_ROUTE_43 warp_def $0, $5, 5, GROUP_ROUTE_43, MAP_ROUTE_43 warp_def $7, $4, 3, GROUP_ROUTE_43, MAP_ROUTE_43 warp_def $7, $5, 3, GROUP_ROUTE_43, MAP_ROUTE_43 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x19ac85, EVENT_LAKE_OF_RAGE_CIVILIANS person_event SPRITE_ROCKET, 8, 6, OW_UP | $2, $0, -1, -1, $0, 0, RocketScript_0x19ac82, EVENT_ROUTE_43_GATE_ROCKETS diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index d6f3f524b..8ef780243 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -1,8 +1,8 @@ Route43MahoganyGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x19ab0b: @@ -39,19 +39,19 @@ Route43MahoganyGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 1, GROUP_ROUTE_43, MAP_ROUTE_43 warp_def $0, $5, 2, GROUP_ROUTE_43, MAP_ROUTE_43 warp_def $7, $4, 5, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN warp_def $7, $5, 5, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x19ab0b, -1 diff --git a/maps/Route44.asm b/maps/Route44.asm index c527a9df8..86c54a885 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -1,8 +1,8 @@ Route44_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBird_keeperVance1: @@ -498,20 +498,20 @@ Route44_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $38, 1, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 7, 53, SIGNPOST_READ, MapRoute44Signpost0Script signpost 10, 6, SIGNPOST_READ, MapRoute44Signpost1Script signpost 9, 32, SIGNPOST_ITEM, MapRoute44SignpostItem2 - ; people-events +.PersonEvents: db 11 person_event SPRITE_FISHER, 7, 39, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherWilton1, -1 person_event SPRITE_FISHER, 17, 23, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherEdgar, -1 diff --git a/maps/Route45.asm b/maps/Route45.asm index 8cb2fa4aa..160fd7090 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -1,8 +1,8 @@ Route45_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBlackbeltKenji: @@ -521,19 +521,19 @@ Route45_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $5, $2, 1, GROUP_DARK_CAVE_BLACKTHORN_ENTRANCE, MAP_DARK_CAVE_BLACKTHORN_ENTRANCE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 4, 10, SIGNPOST_READ, MapRoute45Signpost0Script signpost 80, 13, SIGNPOST_ITEM, MapRoute45SignpostItem1 - ; people-events +.PersonEvents: db 13 person_event SPRITE_POKEFAN_M, 20, 14, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerHikerErik, -1 person_event SPRITE_POKEFAN_M, 69, 19, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerMichael, -1 diff --git a/maps/Route46.asm b/maps/Route46.asm index 839ad7f7f..58cd08645 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -1,8 +1,8 @@ Route46_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerCamperTed: @@ -246,20 +246,20 @@ Route46_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $21, $7, 1, GROUP_ROUTE_29_46_GATE, MAP_ROUTE_29_46_GATE warp_def $21, $8, 2, GROUP_ROUTE_29_46_GATE, MAP_ROUTE_29_46_GATE warp_def $5, $e, 3, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 27, 9, SIGNPOST_READ, MapRoute46Signpost0Script - ; people-events +.PersonEvents: db 6 person_event SPRITE_POKEFAN_M, 23, 16, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerBailey, -1 person_event SPRITE_YOUNGSTER, 18, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerCamperTed, -1 diff --git a/maps/Route5.asm b/maps/Route5.asm index d9f3bec3e..e1413523a 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -1,8 +1,8 @@ Route5_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x1adb19: @@ -40,21 +40,21 @@ Route5_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $f, $11, 1, GROUP_ROUTE_5_UNDERGROUND_ENTRANCE, MAP_ROUTE_5_UNDERGROUND_ENTRANCE warp_def $11, $8, 1, GROUP_ROUTE_5_SAFFRON_CITY_GATE, MAP_ROUTE_5_SAFFRON_CITY_GATE warp_def $11, $9, 2, GROUP_ROUTE_5_SAFFRON_CITY_GATE, MAP_ROUTE_5_SAFFRON_CITY_GATE warp_def $b, $a, 1, GROUP_ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, MAP_ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 17, 17, SIGNPOST_READ, MapRoute5Signpost0Script signpost 11, 10, SIGNPOST_READ, MapRoute5Signpost1Script - ; people-events +.PersonEvents: db 1 person_event SPRITE_POKEFAN_M, 20, 21, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x1adb19, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index c57f06c59..8c65f57d9 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -1,8 +1,8 @@ Route5CleanseTagSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GrannyScript_0x18b634: @@ -60,20 +60,20 @@ Route5CleanseTagSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_ROUTE_5, MAP_ROUTE_5 warp_def $7, $3, 4, GROUP_ROUTE_5, MAP_ROUTE_5 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, HouseForSaleBookshelf signpost 1, 1, SIGNPOST_READ, HouseForSaleBookshelf - ; people-events +.PersonEvents: db 2 person_event SPRITE_GRANNY, 9, 6, OW_RIGHT | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrannyScript_0x18b634, -1 person_event SPRITE_TEACHER, 7, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, TeacherScript_0x18b64f, -1 diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm index 962257edc..92392edc0 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronCityGate.asm @@ -1,8 +1,8 @@ Route5SaffronCityGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x18b5b9: @@ -21,19 +21,19 @@ Route5SaffronCityGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 2, GROUP_ROUTE_5, MAP_ROUTE_5 warp_def $0, $5, 3, GROUP_ROUTE_5, MAP_ROUTE_5 warp_def $7, $4, 9, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $7, $5, 9, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x18b5b9, -1 diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm index cf5f99d4d..a56946e23 100644 --- a/maps/Route5UndergroundEntrance.asm +++ b/maps/Route5UndergroundEntrance.asm @@ -1,8 +1,8 @@ Route5UndergroundEntrance_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x18b555: @@ -20,18 +20,18 @@ Route5UndergroundEntrance_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_ROUTE_5, MAP_ROUTE_5 warp_def $7, $4, 1, GROUP_ROUTE_5, MAP_ROUTE_5 warp_def $3, $4, 1, GROUP_UNDERGROUND, MAP_UNDERGROUND - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_TEACHER, 6, 6, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x18b555, -1 diff --git a/maps/Route6.asm b/maps/Route6.asm index 4e0455630..06e2f0c7c 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -1,8 +1,8 @@ Route6_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerPokefanmRex: @@ -90,19 +90,19 @@ Route6_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $11, 1, GROUP_ROUTE_6_UNDERGROUND_ENTRANCE, MAP_ROUTE_6_UNDERGROUND_ENTRANCE warp_def $1, $6, 3, GROUP_ROUTE_6_SAFFRON_GATE, MAP_ROUTE_6_SAFFRON_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 5, 19, SIGNPOST_READ, MapRoute6Signpost0Script - ; people-events +.PersonEvents: db 3 person_event SPRITE_POKEFAN_M, 8, 21, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 2, PokefanMScript_0x1ad951, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH person_event SPRITE_POKEFAN_M, 16, 13, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerPokefanmRex, -1 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index a5cfa098a..33d8b5029 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -1,11 +1,11 @@ Route6SaffronGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x1926e9, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x1926e9: @@ -60,19 +60,19 @@ Route6SaffronGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 12, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $0, $5, 13, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $7, $4, 2, GROUP_ROUTE_6, MAP_ROUTE_6 warp_def $7, $5, 2, GROUP_ROUTE_6, MAP_ROUTE_6 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x1926ea, -1 diff --git a/maps/Route6UndergroundEntrance.asm b/maps/Route6UndergroundEntrance.asm index 9359f3fca..56b52d2cc 100644 --- a/maps/Route6UndergroundEntrance.asm +++ b/maps/Route6UndergroundEntrance.asm @@ -1,25 +1,25 @@ Route6UndergroundEntrance_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 Route6UndergroundEntrance_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_ROUTE_6, MAP_ROUTE_6 warp_def $7, $4, 1, GROUP_ROUTE_6, MAP_ROUTE_6 warp_def $3, $4, 2, GROUP_UNDERGROUND, MAP_UNDERGROUND - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/Route7.asm b/maps/Route7.asm index 8345a7a2a..8953a3c25 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -1,8 +1,8 @@ Route7_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MapRoute7Signpost0Script: @@ -38,18 +38,18 @@ Route7_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $6, $f, 1, GROUP_ROUTE_7_SAFFRON_GATE, MAP_ROUTE_7_SAFFRON_GATE warp_def $7, $f, 2, GROUP_ROUTE_7_SAFFRON_GATE, MAP_ROUTE_7_SAFFRON_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 11, 5, SIGNPOST_READ, MapRoute7Signpost0Script signpost 9, 6, SIGNPOST_READ, MapRoute7Signpost1Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 91a9db9dd..f1e209da1 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -1,8 +1,8 @@ Route7SaffronGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x73518: @@ -46,19 +46,19 @@ Route7SaffronGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 1, GROUP_ROUTE_7, MAP_ROUTE_7 warp_def $5, $0, 2, GROUP_ROUTE_7, MAP_ROUTE_7 warp_def $4, $9, 10, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $5, $9, 11, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x73518, -1 diff --git a/maps/Route8.asm b/maps/Route8.asm index 07e23e38e..f8fd07184 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -1,8 +1,8 @@ Route8_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBikerDwayne: @@ -168,20 +168,20 @@ Route8_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $4, $4, 3, GROUP_ROUTE_8_SAFFRON_GATE, MAP_ROUTE_8_SAFFRON_GATE warp_def $5, $4, 4, GROUP_ROUTE_8_SAFFRON_GATE, MAP_ROUTE_8_SAFFRON_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 7, 11, SIGNPOST_READ, MapRoute8Signpost0Script signpost 5, 10, SIGNPOST_READ, MapRoute8Signpost1Script - ; people-events +.PersonEvents: db 6 person_event SPRITE_BIKER, 12, 14, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerBikerDwayne, -1 person_event SPRITE_BIKER, 13, 14, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 5, TrainerBikerHarris, -1 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index c20459eff..aa9cb7ca9 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -1,8 +1,8 @@ Route8SaffronGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x7f416: @@ -20,19 +20,19 @@ Route8SaffronGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 14, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $5, $0, 15, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $4, $9, 1, GROUP_ROUTE_8, MAP_ROUTE_8 warp_def $5, $9, 2, GROUP_ROUTE_8, MAP_ROUTE_8 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x7f416, -1 diff --git a/maps/Route9.asm b/maps/Route9.asm index 2d7cb6e20..dbf5ad79a 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -1,8 +1,8 @@ Route9_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerCamperDean: @@ -202,19 +202,19 @@ Route9_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $f, $30, 1, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 7, 15, SIGNPOST_READ, MapRoute9Signpost0Script signpost 15, 41, SIGNPOST_ITEM, MapRoute9SignpostItem1 - ; people-events +.PersonEvents: db 6 person_event SPRITE_YOUNGSTER, 15, 27, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerCamperDean, -1 person_event SPRITE_LASS, 12, 43, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerPicnickerHeidi, -1 diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index 0e6245923..aebf46743 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -1,12 +1,12 @@ RuinsofAlphAerodactylChamber_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x58dad, $0000 dw UnknownScript_0x58db8, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -152,7 +152,7 @@ RuinsofAlphAerodactylChamber_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $9, $3, 4, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $9, $4, 4, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE @@ -160,10 +160,10 @@ RuinsofAlphAerodactylChamber_MapEventHeader: warp_def $3, $4, 9, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER warp_def $0, $4, 1, GROUP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, MAP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphAerodactylChamberSignpost1Script signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphAerodactylChamberSignpost1Script @@ -172,5 +172,5 @@ RuinsofAlphAerodactylChamber_MapEventHeader: signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost4Script signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost5Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/RuinsofAlphAerodactylItemRoom.asm b/maps/RuinsofAlphAerodactylItemRoom.asm index 4b670573b..1eb5ece90 100644 --- a/maps/RuinsofAlphAerodactylItemRoom.asm +++ b/maps/RuinsofAlphAerodactylItemRoom.asm @@ -1,8 +1,8 @@ RuinsofAlphAerodactylItemRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x59ab6: @@ -30,22 +30,22 @@ RuinsofAlphAerodactylItemRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $9, $3, 5, GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER, MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER warp_def $9, $4, 5, GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER, MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER warp_def $1, $3, 1, GROUP_RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, MAP_RUINS_OF_ALPH_AERODACTYL_WORD_ROOM warp_def $1, $4, 2, GROUP_RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, MAP_RUINS_OF_ALPH_AERODACTYL_WORD_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphAerodactylItemRoomSignpost1Script signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphAerodactylItemRoomSignpost1Script - ; people-events +.PersonEvents: db 4 person_event SPRITE_POKE_BALL, 10, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59ab6, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM person_event SPRITE_POKE_BALL, 10, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59ab8, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM diff --git a/maps/RuinsofAlphAerodactylWordRoom.asm b/maps/RuinsofAlphAerodactylWordRoom.asm index 447bdca02..29d56222e 100644 --- a/maps/RuinsofAlphAerodactylWordRoom.asm +++ b/maps/RuinsofAlphAerodactylWordRoom.asm @@ -1,25 +1,25 @@ RuinsofAlphAerodactylWordRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 RuinsofAlphAerodactylWordRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $5, $9, 3, GROUP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, MAP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM warp_def $5, $a, 4, GROUP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, MAP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM warp_def $b, $11, 8, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index 77652fa80..b75262481 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -1,12 +1,12 @@ RuinsofAlphHoOhChamber_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x5856d, $0000 dw UnknownScript_0x5857b, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -153,7 +153,7 @@ RuinsofAlphHoOhChamber_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $9, $3, 1, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $9, $4, 1, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE @@ -161,10 +161,10 @@ RuinsofAlphHoOhChamber_MapEventHeader: warp_def $3, $4, 3, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER warp_def $0, $4, 1, GROUP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM, MAP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphHoOhChamberSignpost1Script signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphHoOhChamberSignpost1Script @@ -173,5 +173,5 @@ RuinsofAlphHoOhChamber_MapEventHeader: signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost4Script signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost5Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/RuinsofAlphHoOhItemRoom.asm b/maps/RuinsofAlphHoOhItemRoom.asm index 46bfa86b1..70476bbde 100644 --- a/maps/RuinsofAlphHoOhItemRoom.asm +++ b/maps/RuinsofAlphHoOhItemRoom.asm @@ -1,8 +1,8 @@ RuinsofAlphHoOhItemRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x59918: @@ -30,22 +30,22 @@ RuinsofAlphHoOhItemRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $9, $3, 5, GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER, MAP_RUINS_OF_ALPH_HO_OH_CHAMBER warp_def $9, $4, 5, GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER, MAP_RUINS_OF_ALPH_HO_OH_CHAMBER warp_def $1, $3, 1, GROUP_RUINS_OF_ALPH_HO_OH_WORD_ROOM, MAP_RUINS_OF_ALPH_HO_OH_WORD_ROOM warp_def $1, $4, 2, GROUP_RUINS_OF_ALPH_HO_OH_WORD_ROOM, MAP_RUINS_OF_ALPH_HO_OH_WORD_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphHoOhItemRoomSignpost1Script signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphHoOhItemRoomSignpost1Script - ; people-events +.PersonEvents: db 4 person_event SPRITE_POKE_BALL, 10, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59918, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM person_event SPRITE_POKE_BALL, 10, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5991a, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM diff --git a/maps/RuinsofAlphHoOhWordRoom.asm b/maps/RuinsofAlphHoOhWordRoom.asm index ae71b1ebc..f11abcd6a 100644 --- a/maps/RuinsofAlphHoOhWordRoom.asm +++ b/maps/RuinsofAlphHoOhWordRoom.asm @@ -1,25 +1,25 @@ RuinsofAlphHoOhWordRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 RuinsofAlphHoOhWordRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $9, $9, 3, GROUP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM, MAP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM warp_def $9, $a, 4, GROUP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM, MAP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM warp_def $15, $11, 2, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index 96d5ce401..311714c86 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -1,12 +1,12 @@ RuinsofAlphInnerChamber_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x58f69, $0000 dw UnknownScript_0x58f6a, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x58f69: @@ -79,7 +79,7 @@ RuinsofAlphInnerChamber_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 9 warp_def $d, $a, 5, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $f, $3, 3, GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER, MAP_RUINS_OF_ALPH_HO_OH_CHAMBER @@ -91,10 +91,10 @@ RuinsofAlphInnerChamber_MapEventHeader: warp_def $18, $f, 3, GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER, MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER warp_def $18, $10, 4, GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER, MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 26 signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script @@ -123,7 +123,7 @@ RuinsofAlphInnerChamber_MapEventHeader: signpost 24, 14, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script signpost 24, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script - ; people-events +.PersonEvents: db 3 person_event SPRITE_FISHER, 11, 7, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x58f7d, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS person_event SPRITE_TEACHER, 17, 18, OW_DOWN | $2, $11, -1, -1, $0, 0, TeacherScript_0x58f80, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index ae6f10e7c..18f537546 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -1,12 +1,12 @@ RuinsofAlphKabutoChamber_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x5872b, $0000 dw UnknownScript_0x58736, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -262,7 +262,7 @@ RuinsofAlphKabutoChamber_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $9, $3, 2, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $9, $4, 2, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE @@ -270,10 +270,10 @@ RuinsofAlphKabutoChamber_MapEventHeader: warp_def $3, $4, 5, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER warp_def $0, $4, 1, GROUP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM, MAP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphKabutoChamberSignpost1Script signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphKabutoChamberSignpost1Script @@ -282,7 +282,7 @@ RuinsofAlphKabutoChamber_MapEventHeader: signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost4Script signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost5Script - ; people-events +.PersonEvents: db 2 person_event SPRITE_RECEPTIONIST, 9, 9, OW_UP | $2, $0, -1, -1, $0, 0, ReceptionistScript_0x58769, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST person_event SPRITE_SCIENTIST, 5, 7, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x587a8, -1 diff --git a/maps/RuinsofAlphKabutoItemRoom.asm b/maps/RuinsofAlphKabutoItemRoom.asm index fb0e1d19b..67c4c8681 100644 --- a/maps/RuinsofAlphKabutoItemRoom.asm +++ b/maps/RuinsofAlphKabutoItemRoom.asm @@ -1,8 +1,8 @@ RuinsofAlphKabutoItemRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x599a2: @@ -30,22 +30,22 @@ RuinsofAlphKabutoItemRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $9, $3, 5, GROUP_RUINS_OF_ALPH_KABUTO_CHAMBER, MAP_RUINS_OF_ALPH_KABUTO_CHAMBER warp_def $9, $4, 5, GROUP_RUINS_OF_ALPH_KABUTO_CHAMBER, MAP_RUINS_OF_ALPH_KABUTO_CHAMBER warp_def $1, $3, 1, GROUP_RUINS_OF_ALPH_KABUTO_WORD_ROOM, MAP_RUINS_OF_ALPH_KABUTO_WORD_ROOM warp_def $1, $4, 2, GROUP_RUINS_OF_ALPH_KABUTO_WORD_ROOM, MAP_RUINS_OF_ALPH_KABUTO_WORD_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphKabutoItemRoomSignpost1Script signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphKabutoItemRoomSignpost1Script - ; people-events +.PersonEvents: db 4 person_event SPRITE_POKE_BALL, 10, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x599a2, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM person_event SPRITE_POKE_BALL, 10, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x599a4, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM diff --git a/maps/RuinsofAlphKabutoWordRoom.asm b/maps/RuinsofAlphKabutoWordRoom.asm index 01c0f59fe..24b821c6d 100644 --- a/maps/RuinsofAlphKabutoWordRoom.asm +++ b/maps/RuinsofAlphKabutoWordRoom.asm @@ -1,25 +1,25 @@ RuinsofAlphKabutoWordRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 RuinsofAlphKabutoWordRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $5, $9, 3, GROUP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM, MAP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM warp_def $5, $a, 4, GROUP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM, MAP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM warp_def $b, $11, 4, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 0bd926a57..39113d64a 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -1,12 +1,12 @@ RuinsofAlphOmanyteChamber_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x58be9, $0000 dw UnknownScript_0x58bf7, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -153,7 +153,7 @@ RuinsofAlphOmanyteChamber_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $9, $3, 3, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $9, $4, 3, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE @@ -161,10 +161,10 @@ RuinsofAlphOmanyteChamber_MapEventHeader: warp_def $3, $4, 7, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER warp_def $0, $4, 1, GROUP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, MAP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphOmanyteChamberSignpost1Script signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphOmanyteChamberSignpost1Script @@ -173,5 +173,5 @@ RuinsofAlphOmanyteChamber_MapEventHeader: signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost4Script signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost5Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/RuinsofAlphOmanyteItemRoom.asm b/maps/RuinsofAlphOmanyteItemRoom.asm index 266af2f3e..2cc8a786b 100644 --- a/maps/RuinsofAlphOmanyteItemRoom.asm +++ b/maps/RuinsofAlphOmanyteItemRoom.asm @@ -1,8 +1,8 @@ RuinsofAlphOmanyteItemRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x59a2c: @@ -30,22 +30,22 @@ RuinsofAlphOmanyteItemRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $9, $3, 5, GROUP_RUINS_OF_ALPH_OMANYTE_CHAMBER, MAP_RUINS_OF_ALPH_OMANYTE_CHAMBER warp_def $9, $4, 5, GROUP_RUINS_OF_ALPH_OMANYTE_CHAMBER, MAP_RUINS_OF_ALPH_OMANYTE_CHAMBER warp_def $1, $3, 1, GROUP_RUINS_OF_ALPH_OMANYTE_WORD_ROOM, MAP_RUINS_OF_ALPH_OMANYTE_WORD_ROOM warp_def $1, $4, 2, GROUP_RUINS_OF_ALPH_OMANYTE_WORD_ROOM, MAP_RUINS_OF_ALPH_OMANYTE_WORD_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphOmanyteItemRoomSignpost1Script signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphOmanyteItemRoomSignpost1Script - ; people-events +.PersonEvents: db 4 person_event SPRITE_POKE_BALL, 10, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59a2c, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM person_event SPRITE_POKE_BALL, 10, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59a2e, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM diff --git a/maps/RuinsofAlphOmanyteWordRoom.asm b/maps/RuinsofAlphOmanyteWordRoom.asm index 9c1906e42..cfd469320 100644 --- a/maps/RuinsofAlphOmanyteWordRoom.asm +++ b/maps/RuinsofAlphOmanyteWordRoom.asm @@ -1,25 +1,25 @@ RuinsofAlphOmanyteWordRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 RuinsofAlphOmanyteWordRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $9, 3, GROUP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, MAP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM warp_def $7, $a, 4, GROUP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, MAP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM warp_def $d, $11, 6, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 918d37164..510a2a66b 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -1,12 +1,12 @@ RuinsofAlphOutside_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x5800d, $0000 dw UnknownScript_0x5800e, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -284,7 +284,7 @@ RuinsofAlphOutside_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 11 warp_def $11, $2, 1, GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER, MAP_RUINS_OF_ALPH_HO_OH_CHAMBER warp_def $7, $e, 1, GROUP_RUINS_OF_ALPH_KABUTO_CHAMBER, MAP_RUINS_OF_ALPH_KABUTO_CHAMBER @@ -298,18 +298,18 @@ RuinsofAlphOutside_MapEventHeader: warp_def $14, $d, 1, GROUP_ROUTE_32_RUINS_OF_ALPH_GATE, MAP_ROUTE_32_RUINS_OF_ALPH_GATE warp_def $15, $d, 2, GROUP_ROUTE_32_RUINS_OF_ALPH_GATE, MAP_ROUTE_32_RUINS_OF_ALPH_GATE - ; xy triggers +.XYTriggers: db 2 xy_trigger 1, $e, $b, $0, UnknownScript_0x58031, $0, $0 xy_trigger 1, $f, $a, $0, UnknownScript_0x5803a, $0, $0 - ; signposts +.Signposts: db 3 signpost 8, 16, SIGNPOST_READ, MapRuinsofAlphOutsideSignpost0Script signpost 16, 12, SIGNPOST_READ, MapRuinsofAlphOutsideSignpost1Script signpost 12, 18, SIGNPOST_READ, MapRuinsofAlphOutsideSignpost2Script - ; people-events +.PersonEvents: db 5 person_event SPRITE_YOUNGSTER, 24, 8, OW_UP | $2, $0, -1, -1, $2, 1, TrainerPsychicNathan, -1 person_event SPRITE_SCIENTIST, 19, 15, OW_UP | $3, $0, -1, -1, $0, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index 3f89c89d7..121a624af 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -1,12 +1,12 @@ RuinsofAlphResearchCenter_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x59180, $0000 dw UnknownScript_0x59181, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -396,21 +396,21 @@ RuinsofAlphResearchCenter_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 6, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $7, $3, 6, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 5, 6, SIGNPOST_READ, MapRuinsofAlphResearchCenterSignpost0Script signpost 4, 3, SIGNPOST_READ, MapRuinsofAlphResearchCenterSignpost1Script signpost 1, 7, SIGNPOST_READ, MapRuinsofAlphResearchCenterSignpost2Script - ; people-events +.PersonEvents: db 3 person_event SPRITE_SCIENTIST, 9, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x591e5, -1 person_event SPRITE_SCIENTIST, 6, 9, OW_DOWN | $2, $12, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x59214, -1 diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index b6a7c3d6c..ba0306348 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -1,24 +1,24 @@ SafariZoneBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SafariZoneBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $17, $9, 1, GROUP_SAFARI_ZONE_FUCHSIA_GATE_BETA, MAP_SAFARI_ZONE_FUCHSIA_GATE_BETA warp_def $17, $a, 2, GROUP_SAFARI_ZONE_FUCHSIA_GATE_BETA, MAP_SAFARI_ZONE_FUCHSIA_GATE_BETA - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index b654681d1..3118cc247 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -1,26 +1,26 @@ SafariZoneFuchsiaGateBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SafariZoneFuchsiaGateBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 1, GROUP_SAFARI_ZONE_BETA, MAP_SAFARI_ZONE_BETA warp_def $0, $5, 2, GROUP_SAFARI_ZONE_BETA, MAP_SAFARI_ZONE_BETA warp_def $7, $4, 7, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $7, $5, 7, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index a34ae2c29..ec00d976c 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -1,24 +1,24 @@ SafariZoneMainOffice_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SafariZoneMainOffice_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $7, $3, 2, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 04074d5b5..19f296234 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -1,8 +1,8 @@ SafariZoneWardensHome_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 WardensGranddaughter: @@ -77,21 +77,21 @@ SafariZoneWardensHome_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 6, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $7, $3, 6, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 signpost 1, 0, SIGNPOST_READ, WardensHomeBookshelf signpost 1, 1, SIGNPOST_READ, WardensHomeBookshelf signpost 0, 7, SIGNPOST_READ, WardenPhoto signpost 0, 9, SIGNPOST_READ, SafariZonePhoto - ; people-events +.PersonEvents: db 1 person_event SPRITE_LASS, 8, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, WardensGranddaughter, -1 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index a3b2e02f4..947e3192b 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -1,8 +1,8 @@ SaffronCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -261,7 +261,7 @@ SaffronCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 15 warp_def $3, $1a, 1, GROUP_FIGHTING_DOJO, MAP_FIGHTING_DOJO warp_def $3, $22, 1, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM @@ -279,10 +279,10 @@ SaffronCity_MapEventHeader: warp_def $16, $27, 1, GROUP_ROUTE_8_SAFFRON_GATE, MAP_ROUTE_8_SAFFRON_GATE warp_def $17, $27, 2, GROUP_ROUTE_8_SAFFRON_GATE, MAP_ROUTE_8_SAFFRON_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 8 signpost 5, 21, SIGNPOST_READ, SaffronCitySign signpost 5, 33, SIGNPOST_READ, SaffronGymSign @@ -293,7 +293,7 @@ SaffronCity_MapEventHeader: signpost 29, 10, SIGNPOST_READ, SaffronCityPokeCenterSign signpost 11, 26, SIGNPOST_READ, SaffronCityMartSign - ; people-events +.PersonEvents: db 8 person_event SPRITE_LASS, 18, 11, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, LassScript_0x19932a, -1 person_event SPRITE_POKEFAN_M, 34, 23, OW_UP | $1, $2, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x19933e, -1 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index e03fcec83..dbb330478 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -1,8 +1,8 @@ SaffronGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SabrinaScript_0x189c2e: @@ -286,7 +286,7 @@ SaffronGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 32 warp_def $11, $8, 2, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $11, $9, 2, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY @@ -321,14 +321,14 @@ SaffronGym_MapEventHeader: warp_def $3, $1, 16, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM warp_def $9, $b, 17, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 15, 8, SIGNPOST_READ, SaffronGymStatue - ; people-events +.PersonEvents: db 6 person_event SPRITE_SABRINA, 12, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SabrinaScript_0x189c2e, -1 person_event SPRITE_GRANNY, 20, 21, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerMediumRebecca, -1 diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 1634dffc6..df0e3c684 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -1,8 +1,8 @@ SaffronMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x18a3bf: @@ -36,18 +36,18 @@ SaffronMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $7, $3, 3, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x18a3bf, -1 person_event SPRITE_COOLTRAINER_M, 6, 11, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CooltrainerMScript_0x18a3c6, -1 diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index d37dd2399..e155cc53f 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -1,8 +1,8 @@ SaffronPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x18a47d: @@ -109,19 +109,19 @@ SaffronPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 4, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $7, $4, 4, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x18a47d, -1 person_event SPRITE_TEACHER, 6, 11, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x18a480, -1 diff --git a/maps/SaffronPokeCenter2FBeta.asm b/maps/SaffronPokeCenter2FBeta.asm index 51a846ea0..a3c6d29ab 100644 --- a/maps/SaffronPokeCenter2FBeta.asm +++ b/maps/SaffronPokeCenter2FBeta.asm @@ -1,23 +1,23 @@ SaffronPokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SaffronPokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_SAFFRON_POKECENTER_1F, MAP_SAFFRON_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index c4653f8c4..6ba8972a9 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -1,11 +1,11 @@ SaffronTrainStation_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x18a81d, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x18a81d: @@ -215,21 +215,21 @@ SaffronTrainStation_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $11, $8, 6, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $11, $9, 6, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $5, $6, 4, GROUP_GOLDENROD_MAGNET_TRAIN_STATION, MAP_GOLDENROD_MAGNET_TRAIN_STATION warp_def $5, $b, 3, GROUP_GOLDENROD_MAGNET_TRAIN_STATION, MAP_GOLDENROD_MAGNET_TRAIN_STATION - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $6, $b, $0, UnknownScript_0x18a862, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_OFFICER, 13, 13, OW_UP | $2, $0, -1, -1, $0, 0, OfficerScript_0x18a81e, -1 person_event SPRITE_GYM_GUY, 18, 14, OW_DOWN | $2, $11, -1, -1, $0, 0, GymGuyScript_0x18a875, -1 diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 3203c82e8..29bcd8bca 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -1,11 +1,11 @@ SeafoamGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x1ab4fa, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x1ab4fa: @@ -159,17 +159,17 @@ SeafoamGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $5, $5, 1, GROUP_ROUTE_20, MAP_ROUTE_20 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_BLAINE, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BlaineScript_0x1ab4fb, -1 person_event SPRITE_GYM_GUY, 9, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 003e36472..8107ce95e 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -1,8 +1,8 @@ SilphCo1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ReceptionistScript_0x18abe5: @@ -55,18 +55,18 @@ SilphCo1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 7, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $7, $3, 7, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_RECEPTIONIST, 6, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ReceptionistScript_0x18abe5, -1 person_event SPRITE_OFFICER, 5, 17, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x18abe8, -1 diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index f58005010..2a1cd68f3 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -1,8 +1,8 @@ SilverCaveItemRooms_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18c65e: @@ -15,18 +15,18 @@ SilverCaveItemRooms_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $d, 3, GROUP_SILVER_CAVE_ROOM_2, MAP_SILVER_CAVE_ROOM_2 warp_def $f, $7, 4, GROUP_SILVER_CAVE_ROOM_2, MAP_SILVER_CAVE_ROOM_2 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_POKE_BALL, 7, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c65e, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE person_event SPRITE_POKE_BALL, 15, 19, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c660, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 9120d097b..84520d6ba 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -1,8 +1,8 @@ SilverCaveOutside_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -29,19 +29,19 @@ SilverCaveOutside_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $13, $17, 1, GROUP_SILVER_CAVE_POKECENTER_1F, MAP_SILVER_CAVE_POKECENTER_1F warp_def $b, $12, 1, GROUP_SILVER_CAVE_ROOM_1, MAP_SILVER_CAVE_ROOM_1 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 19, 24, SIGNPOST_READ, MtSilverPokeCenterSign signpost 13, 17, SIGNPOST_READ, MtSilverSign signpost 25, 9, SIGNPOST_ITEM, MapSilverCaveOutsideSignpostItem2 - ; people-events +.PersonEvents: db 0 diff --git a/maps/SilverCavePokeCenter1F.asm b/maps/SilverCavePokeCenter1F.asm index 784cdceff..1887ce73b 100644 --- a/maps/SilverCavePokeCenter1F.asm +++ b/maps/SilverCavePokeCenter1F.asm @@ -1,8 +1,8 @@ SilverCavePokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x1ae59a: @@ -29,19 +29,19 @@ SilverCavePokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_SILVER_CAVE_OUTSIDE, MAP_SILVER_CAVE_OUTSIDE warp_def $7, $4, 1, GROUP_SILVER_CAVE_OUTSIDE, MAP_SILVER_CAVE_OUTSIDE warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x1ae59a, -1 person_event SPRITE_GRANNY, 9, 5, OW_LEFT | $0, $12, -1, -1, $0, 0, GrannyScript_0x1ae59d, -1 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 28b2e9171..28cc88f41 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -1,8 +1,8 @@ SilverCaveRoom1_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18c554: @@ -29,20 +29,20 @@ SilverCaveRoom1_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $21, $9, 2, GROUP_SILVER_CAVE_OUTSIDE, MAP_SILVER_CAVE_OUTSIDE warp_def $1, $f, 1, GROUP_SILVER_CAVE_ROOM_2, MAP_SILVER_CAVE_ROOM_2 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 23, 16, SIGNPOST_ITEM, MapSilverCaveRoom1SignpostItem0 signpost 12, 17, SIGNPOST_ITEM, MapSilverCaveRoom1SignpostItem1 - ; people-events +.PersonEvents: db 4 person_event SPRITE_POKE_BALL, 13, 8, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c554, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER person_event SPRITE_POKE_BALL, 33, 19, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c556, EVENT_SILVER_CAVE_ROOM_1_PROTEIN diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index ae32c19b4..39c128e8b 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -1,8 +1,8 @@ SilverCaveRoom2_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18c5b2: @@ -22,21 +22,21 @@ SilverCaveRoom2_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $1f, $11, 2, GROUP_SILVER_CAVE_ROOM_1, MAP_SILVER_CAVE_ROOM_1 warp_def $5, $b, 1, GROUP_SILVER_CAVE_ROOM_3, MAP_SILVER_CAVE_ROOM_3 warp_def $15, $d, 1, GROUP_SILVER_CAVE_ITEM_ROOMS, MAP_SILVER_CAVE_ITEM_ROOMS warp_def $3, $17, 2, GROUP_SILVER_CAVE_ITEM_ROOMS, MAP_SILVER_CAVE_ITEM_ROOMS - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 31, 14, SIGNPOST_ITEM, MapSilverCaveRoom2SignpostItem0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_POKE_BALL, 14, 28, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b2, EVENT_SILVER_CAVE_ROOM_2_CALCIUM person_event SPRITE_POKE_BALL, 28, 26, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b4, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 1631d032a..c1035849e 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -1,8 +1,8 @@ SilverCaveRoom3_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 RedScript_0x18c603: @@ -51,16 +51,16 @@ SilverCaveRoom3_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $21, $9, 2, GROUP_SILVER_CAVE_ROOM_2, MAP_SILVER_CAVE_ROOM_2 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_RED, 14, 13, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, RedScript_0x18c603, EVENT_RED_IN_MT_SILVER diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index bbffda06e..971e3e30a 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -1,8 +1,8 @@ SlowpokeWellB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 KurtScript_0x5a5d5: @@ -313,18 +313,18 @@ SlowpokeWellB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $f, $11, 6, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $b, $7, 1, GROUP_SLOWPOKE_WELL_B2F, MAP_SLOWPOKE_WELL_B2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 9 person_event SPRITE_ROCKET, 11, 19, OW_UP | $2, $0, -1, -1, $2, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS person_event SPRITE_ROCKET, 6, 9, OW_UP | $2, $0, -1, -1, $2, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index f51e70e73..ae74443ec 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -1,8 +1,8 @@ SlowpokeWellB2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GymGuyScript_0x5ad0b: @@ -61,17 +61,17 @@ SlowpokeWellB2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $b, $9, 2, GROUP_SLOWPOKE_WELL_B1F, MAP_SLOWPOKE_WELL_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_GYM_GUY, 8, 9, OW_DOWN | $2, $21, -1, -1, $0, 1, GymGuyScript_0x5ad0b, -1 person_event SPRITE_POKE_BALL, 9, 19, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5ad28, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index a3677897b..6f3aeca87 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -1,8 +1,8 @@ SoulHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GrampsScript_0x7ec47: @@ -70,18 +70,18 @@ SoulHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $4, 6, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN warp_def $7, $5, 6, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_GRAMPS, 6, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x7ec47, -1 person_event SPRITE_TEACHER, 7, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x7ec4a, -1 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 828b7058b..82b1e33b9 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -1,8 +1,8 @@ SproutTower1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SageScript_0x1844fe: @@ -98,7 +98,7 @@ SproutTower1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $f, $9, 7, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $f, $a, 7, GROUP_VIOLET_CITY, MAP_VIOLET_CITY @@ -106,15 +106,15 @@ SproutTower1F_MapEventHeader: warp_def $6, $2, 2, GROUP_SPROUT_TOWER_2F, MAP_SPROUT_TOWER_2F warp_def $3, $11, 3, GROUP_SPROUT_TOWER_2F, MAP_SPROUT_TOWER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 15, 7, SIGNPOST_READ, MapSproutTower1FSignpost1Script signpost 15, 12, SIGNPOST_READ, MapSproutTower1FSignpost1Script - ; people-events +.PersonEvents: db 6 person_event SPRITE_SAGE, 8, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SageScript_0x1844fe, -1 person_event SPRITE_SAGE, 11, 10, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SageScript_0x184501, -1 diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 9e9850ce5..bcf59da24 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -1,8 +1,8 @@ SproutTower2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerSageNico: @@ -83,21 +83,21 @@ SproutTower2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $6, 3, GROUP_SPROUT_TOWER_1F, MAP_SPROUT_TOWER_1F warp_def $6, $2, 4, GROUP_SPROUT_TOWER_1F, MAP_SPROUT_TOWER_1F warp_def $3, $11, 5, GROUP_SPROUT_TOWER_1F, MAP_SPROUT_TOWER_1F warp_def $e, $a, 1, GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 15, 12, SIGNPOST_READ, MapSproutTower2FSignpost0Script - ; people-events +.PersonEvents: db 3 person_event SPRITE_SAGE, 7, 16, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSageNico, -1 person_event SPRITE_SAGE, 18, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerSageEdmond, -1 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 36b424b41..148ef23a6 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -1,12 +1,12 @@ SproutTower3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x184945, $0000 dw UnknownScript_0x184946, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x184945: @@ -326,15 +326,15 @@ SproutTower3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $e, $a, 4, GROUP_SPROUT_TOWER_2F, MAP_SPROUT_TOWER_2F - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $9, $b, $0, UnknownScript_0x184947, $0, $0 - ; signposts +.Signposts: db 6 signpost 1, 8, SIGNPOST_READ, MapSproutTower3FSignpost5Script signpost 1, 11, SIGNPOST_READ, MapSproutTower3FSignpost5Script @@ -343,7 +343,7 @@ SproutTower3F_MapEventHeader: signpost 15, 5, SIGNPOST_READ, MapSproutTower3FSignpost5Script signpost 15, 14, SIGNPOST_READ, MapSproutTower3FSignpost5Script - ; people-events +.PersonEvents: db 7 person_event SPRITE_SAGE, 17, 12, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSageJin, -1 person_event SPRITE_SAGE, 12, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerSageTroy, -1 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index d2173a859..32582ccc7 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -1,11 +1,11 @@ TeamRocketBaseB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x6c65a, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -728,14 +728,14 @@ TeamRocketBaseB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $2, $1b, 3, GROUP_MAHOGANY_MART_1F, MAP_MAHOGANY_MART_1F warp_def $e, $3, 1, GROUP_TEAM_ROCKET_BASE_B2F, MAP_TEAM_ROCKET_BASE_B2F warp_def $f, $5, 4, GROUP_TEAM_ROCKET_BASE_B1F, MAP_TEAM_ROCKET_BASE_B1F warp_def $2, $19, 3, GROUP_TEAM_ROCKET_BASE_B1F, MAP_TEAM_ROCKET_BASE_B1F - ; xy triggers +.XYTriggers: db 30 ; There are five security cameras in the base. ; Walking in front of one triggers two Rocket Grunts. @@ -772,7 +772,7 @@ TeamRocketBaseB1F_MapEventHeader: xy_trigger 0, $d, $4, $0, ExplodingTrap21, $0, $0 xy_trigger 0, $d, $5, $0, ExplodingTrap22, $0, $0 - ; signposts +.Signposts: db 9 signpost 11, 19, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost0Script signpost 1, 24, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script @@ -784,7 +784,7 @@ TeamRocketBaseB1F_MapEventHeader: signpost 11, 21, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script signpost 11, 3, SIGNPOST_ITEM, MapTeamRocketBaseB1FSignpostItem8 - ; people-events +.PersonEvents: db 6 person_event SPRITE_ROCKET, 4, 4, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS person_event SPRITE_ROCKET, 8, 6, OW_LEFT | $1, $0, -1, -1, $2, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 966f74788..701173fba 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -1,5 +1,5 @@ TeamRocketBaseB2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 4 ; triggers @@ -8,7 +8,7 @@ TeamRocketBaseB2F_MapScriptHeader: dw UnknownScript_0x6cf87, $0000 dw UnknownScript_0x6cf88, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -904,7 +904,7 @@ TeamRocketBaseB2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $e, $3, 2, GROUP_TEAM_ROCKET_BASE_B1F, MAP_TEAM_ROCKET_BASE_B1F warp_def $2, $3, 1, GROUP_TEAM_ROCKET_BASE_B3F, MAP_TEAM_ROCKET_BASE_B3F @@ -912,7 +912,7 @@ TeamRocketBaseB2F_MapEventHeader: warp_def $6, $3, 3, GROUP_TEAM_ROCKET_BASE_B3F, MAP_TEAM_ROCKET_BASE_B3F warp_def $e, $1b, 4, GROUP_TEAM_ROCKET_BASE_B3F, MAP_TEAM_ROCKET_BASE_B3F - ; xy triggers +.XYTriggers: db 9 xy_trigger 0, $e, $5, $0, UnknownScript_0x6d085, $0, $0 xy_trigger 0, $d, $4, $0, UnknownScript_0x6d08b, $0, $0 @@ -924,7 +924,7 @@ TeamRocketBaseB2F_MapEventHeader: xy_trigger 2, $a, $c, $0, UnknownScript_0x6d07a, $0, $0 xy_trigger 2, $b, $c, $0, UnknownScript_0x6d07a, $0, $0 - ; signposts +.Signposts: db 23 signpost 12, 14, SIGNPOST_IFNOTSET, MapTeamRocketBaseB2FSignpostPtr1 signpost 12, 15, SIGNPOST_IFNOTSET, MapTeamRocketBaseB2FSignpostPtr1 @@ -950,7 +950,7 @@ TeamRocketBaseB2F_MapEventHeader: signpost 8, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script signpost 7, 26, SIGNPOST_ITEM, MapTeamRocketBaseB2FSignpostItem22 - ; people-events +.PersonEvents: db 14 person_event SPRITE_ROCKET, 20, 24, OW_UP | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE person_event SPRITE_ROCKET_GIRL, 20, 24, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index d190e03b1..f0a2519ef 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -1,5 +1,5 @@ TeamRocketBaseB3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 4 ; triggers @@ -8,7 +8,7 @@ TeamRocketBaseB3F_MapScriptHeader: dw .Trigger3, $0000 dw .Trigger4, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -559,20 +559,20 @@ TeamRocketBaseB3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $2, $3, 2, GROUP_TEAM_ROCKET_BASE_B2F, MAP_TEAM_ROCKET_BASE_B2F warp_def $2, $1b, 3, GROUP_TEAM_ROCKET_BASE_B2F, MAP_TEAM_ROCKET_BASE_B2F warp_def $6, $3, 4, GROUP_TEAM_ROCKET_BASE_B2F, MAP_TEAM_ROCKET_BASE_B2F warp_def $e, $1b, 5, GROUP_TEAM_ROCKET_BASE_B2F, MAP_TEAM_ROCKET_BASE_B2F - ; xy triggers +.XYTriggers: db 3 xy_trigger 2, $8, $a, $0, UnknownScript_0x6e04b, $0, $0 xy_trigger 2, $8, $b, $0, UnknownScript_0x6e052, $0, $0 xy_trigger 1, $a, $8, $0, UnknownScript_0x6e019, $0, $0 - ; signposts +.Signposts: db 10 signpost 9, 10, SIGNPOST_IFNOTSET, BossDoor signpost 9, 11, SIGNPOST_IFNOTSET, BossDoor @@ -585,7 +585,7 @@ TeamRocketBaseB3F_MapEventHeader: signpost 13, 6, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script signpost 13, 7, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script - ; people-events +.PersonEvents: db 14 person_event SPRITE_LANCE, 18, 29, OW_UP | $2, $0, -1, -1, $0, 0, LanceScript_0x6dffc, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS person_event SPRITE_ROCKET, 7, 12, OW_UP | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 4bf81d7eb..8fce13350 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -1,12 +1,12 @@ TimeCapsule_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -58,20 +58,20 @@ TimeCapsule_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $4, 4, GROUP_POKECENTER_2F, MAP_POKECENTER_2F warp_def $7, $5, 4, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 4, 4, SIGNPOST_RIGHT, MapTimeCapsuleSignpost1Script signpost 4, 5, SIGNPOST_LEFT, MapTimeCapsuleSignpost1Script - ; people-events +.PersonEvents: db 2 person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index d6b79a549..e051f844e 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -1,12 +1,12 @@ TinTower1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x18502a, $0000 dw UnknownScript_0x18502e, $0000 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -520,19 +520,19 @@ TinTower1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $f, $9, 12, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $f, $a, 12, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $2, $a, 2, GROUP_TIN_TOWER_2F, MAP_TIN_TOWER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 10 person_event SPRITE_SUICUNE, 13, 13, OW_DOWN | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE person_event SPRITE_RAIKOU, 13, 11, OW_DOWN | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index 03448d61f..254b8e930 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -1,24 +1,24 @@ TinTower2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TinTower2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $e, $a, 1, GROUP_TIN_TOWER_3F, MAP_TIN_TOWER_3F warp_def $2, $a, 3, GROUP_TIN_TOWER_1F, MAP_TIN_TOWER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 5062746a9..705da3cb4 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -1,8 +1,8 @@ TinTower3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x185a37: @@ -12,17 +12,17 @@ TinTower3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $e, $a, 1, GROUP_TIN_TOWER_2F, MAP_TIN_TOWER_2F warp_def $2, $10, 2, GROUP_TIN_TOWER_4F, MAP_TIN_TOWER_4F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_POKE_BALL, 18, 7, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a37, EVENT_TIN_TOWER_3F_FULL_HEAL diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 6321f4f18..a514ca86d 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -1,8 +1,8 @@ TinTower4F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x185a58: @@ -22,21 +22,21 @@ TinTower4F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $2, 2, GROUP_TIN_TOWER_5F, MAP_TIN_TOWER_5F warp_def $2, $10, 2, GROUP_TIN_TOWER_3F, MAP_TIN_TOWER_3F warp_def $e, $2, 3, GROUP_TIN_TOWER_5F, MAP_TIN_TOWER_5F warp_def $f, $11, 4, GROUP_TIN_TOWER_5F, MAP_TIN_TOWER_5F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 6, 11, SIGNPOST_ITEM, MapTinTower4FSignpostItem0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_POKE_BALL, 14, 18, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a58, EVENT_TIN_TOWER_4F_ULTRA_BALL person_event SPRITE_POKE_BALL, 18, 21, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a5a, EVENT_TIN_TOWER_4F_PP_UP diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 3e8a435fd..06e56eaf7 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -1,8 +1,8 @@ TinTower5F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x185aa9: @@ -20,21 +20,21 @@ TinTower5F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $f, $b, 2, GROUP_TIN_TOWER_6F, MAP_TIN_TOWER_6F warp_def $4, $2, 1, GROUP_TIN_TOWER_4F, MAP_TIN_TOWER_4F warp_def $e, $2, 3, GROUP_TIN_TOWER_4F, MAP_TIN_TOWER_4F warp_def $f, $11, 4, GROUP_TIN_TOWER_4F, MAP_TIN_TOWER_4F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 14, 16, SIGNPOST_ITEM, MapTinTower5FSignpostItem0 signpost 15, 3, SIGNPOST_ITEM, MapTinTower5FSignpostItem1 - ; people-events +.PersonEvents: db 1 person_event SPRITE_POKE_BALL, 13, 13, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185aa9, EVENT_TIN_TOWER_5F_RARE_CANDY diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 1563c0cc9..4fb1758a5 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -1,8 +1,8 @@ TinTower6F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x185ae4: @@ -12,17 +12,17 @@ TinTower6F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $9, $3, 1, GROUP_TIN_TOWER_7F, MAP_TIN_TOWER_7F warp_def $f, $b, 1, GROUP_TIN_TOWER_5F, MAP_TIN_TOWER_5F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_POKE_BALL, 12, 12, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ae4, EVENT_TIN_TOWER_6F_MAX_POTION diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 8e45adf04..ceb4494b5 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -1,8 +1,8 @@ TinTower7F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x185b05: @@ -12,7 +12,7 @@ TinTower7F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $9, $3, 1, GROUP_TIN_TOWER_6F, MAP_TIN_TOWER_6F warp_def $f, $a, 1, GROUP_TIN_TOWER_8F, MAP_TIN_TOWER_8F @@ -20,12 +20,12 @@ TinTower7F_MapEventHeader: warp_def $3, $8, 3, GROUP_TIN_TOWER_7F, MAP_TIN_TOWER_7F warp_def $9, $6, 5, GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_POKE_BALL, 5, 20, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b05, EVENT_TIN_TOWER_7F_MAX_REVIVE diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index d1d898daa..15da97cf2 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -1,8 +1,8 @@ TinTower8F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x185b35: @@ -18,7 +18,7 @@ TinTower8F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $5, $2, 2, GROUP_TIN_TOWER_7F, MAP_TIN_TOWER_7F warp_def $b, $2, 1, GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F @@ -27,13 +27,13 @@ TinTower8F_MapEventHeader: warp_def $f, $e, 6, GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F warp_def $9, $6, 7, GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_POKE_BALL, 17, 11, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b35, EVENT_TIN_TOWER_8F_NUGGET person_event SPRITE_POKE_BALL, 10, 15, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b37, EVENT_TIN_TOWER_8F_MAX_ELIXER diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 492c90d3e..a27114998 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -1,8 +1,8 @@ TinTower9F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x185b88: @@ -20,7 +20,7 @@ TinTower9F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 7 warp_def $3, $c, 2, GROUP_TIN_TOWER_8F, MAP_TIN_TOWER_8F warp_def $5, $2, 3, GROUP_TIN_TOWER_8F, MAP_TIN_TOWER_8F @@ -30,12 +30,12 @@ TinTower9F_MapEventHeader: warp_def $d, $6, 5, GROUP_TIN_TOWER_8F, MAP_TIN_TOWER_8F warp_def $d, $8, 6, GROUP_TIN_TOWER_8F, MAP_TIN_TOWER_8F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_POKE_BALL, 5, 13, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b88, EVENT_TIN_TOWER_9F_HP_UP diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index d05bb998a..1d3aef3bd 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -1,8 +1,8 @@ TinTowerRoof_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -48,16 +48,16 @@ TinTowerRoof_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $d, $9, 4, GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_HO_OH, 9, 13, OW_UP | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, HoOhScript_0x77244, EVENT_TIN_TOWER_ROOF_HO_OH diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 76e1bec54..ee3a16e6b 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -1,8 +1,8 @@ TohjoFalls_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18db02: @@ -12,17 +12,17 @@ TohjoFalls_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $f, $d, 2, GROUP_ROUTE_27, MAP_ROUTE_27 warp_def $f, $19, 3, GROUP_ROUTE_27, MAP_ROUTE_27 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_POKE_BALL, 10, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18db02, EVENT_TOHJO_FALLS_MOON_STONE diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 6467e37bb..6e3db4772 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -1,12 +1,12 @@ TradeCenter_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -58,20 +58,20 @@ TradeCenter_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $4, 2, GROUP_POKECENTER_2F, MAP_POKECENTER_2F warp_def $7, $5, 2, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 4, 4, SIGNPOST_RIGHT, MapTradeCenterSignpost1Script signpost 4, 5, SIGNPOST_LEFT, MapTradeCenterSignpost1Script - ; people-events +.PersonEvents: db 2 person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index 07bda0b73..e18ed7b90 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -1,8 +1,8 @@ TrainerHouse1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ReceptionistScript_0x9af67: @@ -134,22 +134,22 @@ TrainerHouse1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $d, $2, 3, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY warp_def $d, $3, 3, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY warp_def $2, $8, 1, GROUP_TRAINER_HOUSE_B1F, MAP_TRAINER_HOUSE_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 0, 5, SIGNPOST_READ, MapTrainerHouse1FSignpost0Script signpost 0, 7, SIGNPOST_READ, MapTrainerHouse1FSignpost1Script signpost 10, 7, SIGNPOST_READ, MapTrainerHouse1FSignpost2Script - ; people-events +.PersonEvents: db 5 person_event SPRITE_RECEPTIONIST, 15, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x9af67, -1 person_event SPRITE_COOLTRAINER_M, 15, 11, OW_UP | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x9af6a, -1 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 8e5797a14..1be37c9aa 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -1,11 +1,11 @@ TrainerHouseB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x9b38a, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x9b38a: @@ -171,18 +171,18 @@ TrainerHouseB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $4, $9, 3, GROUP_TRAINER_HOUSE_1F, MAP_TRAINER_HOUSE_1F - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $3, $7, $0, UnknownScript_0x9b38b, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_RECEPTIONIST, 5, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, -1 person_event SPRITE_CHRIS, 15, 10, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, -1 diff --git a/maps/Underground.asm b/maps/Underground.asm index 620a5cf1f..e2672a95b 100644 --- a/maps/Underground.asm +++ b/maps/Underground.asm @@ -1,8 +1,8 @@ Underground_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MapUndergroundSignpostItem0: @@ -17,18 +17,18 @@ Underground_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $2, $3, 3, GROUP_ROUTE_5_UNDERGROUND_ENTRANCE, MAP_ROUTE_5_UNDERGROUND_ENTRANCE warp_def $18, $3, 3, GROUP_ROUTE_6_UNDERGROUND_ENTRANCE, MAP_ROUTE_6_UNDERGROUND_ENTRANCE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 9, 3, SIGNPOST_ITEM, MapUndergroundSignpostItem0 signpost 19, 1, SIGNPOST_ITEM, MapUndergroundSignpostItem1 - ; people-events +.PersonEvents: db 0 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index b66a668db..14273808b 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -1,12 +1,12 @@ UndergroundPathSwitchRoomEntrances_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x7c9f5, $0000 dw UnknownScript_0x7c9f6, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -895,7 +895,7 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 9 warp_def $3, $17, 6, GROUP_WAREHOUSE_ENTRANCE, MAP_WAREHOUSE_ENTRANCE warp_def $a, $16, 1, GROUP_UNDERGROUND_WAREHOUSE, MAP_UNDERGROUND_WAREHOUSE @@ -907,12 +907,12 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: warp_def $1d, $14, 13, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $1d, $15, 13, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $4, $13, $0, UnknownScript_0x7ca80, $0, $0 xy_trigger 0, $5, $13, $0, UnknownScript_0x7caaa, $0, $0 - ; signposts +.Signposts: db 6 signpost 1, 16, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost0Script signpost 1, 10, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost1Script @@ -921,7 +921,7 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: signpost 9, 8, SIGNPOST_ITEM, MapUndergroundPathSwitchRoomEntrancesSignpostItem4 signpost 8, 1, SIGNPOST_ITEM, MapUndergroundPathSwitchRoomEntrancesSignpostItem5 - ; people-events +.PersonEvents: db 11 person_event SPRITE_PHARMACIST, 16, 13, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_PHARMACIST, 12, 8, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 672afeacc..7f036735b 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -1,8 +1,8 @@ UndergroundWarehouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -208,19 +208,19 @@ UndergroundWarehouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $c, $2, 2, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES warp_def $c, $3, 3, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES warp_def $2, $11, 1, GROUP_GOLDENROD_DEPT_STORE_B1F, MAP_GOLDENROD_DEPT_STORE_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 7 person_event SPRITE_ROCKET, 12, 13, OW_UP | $3, $0, -1, -1, $2, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_ROCKET, 19, 12, OW_UP | $3, $0, -1, -1, $2, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index ddc7e4fec..89bcb27ae 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -1,8 +1,8 @@ UnionCave1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerPokemaniacLarry: @@ -192,20 +192,20 @@ UnionCave1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $13, $5, 3, GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F warp_def $21, $3, 4, GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F warp_def $1f, $11, 1, GROUP_ROUTE_33, MAP_ROUTE_33 warp_def $3, $11, 4, GROUP_ROUTE_32, MAP_ROUTE_32 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 9 person_event SPRITE_POKEFAN_M, 10, 7, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerDaniel, -1 person_event SPRITE_SUPER_NERD, 25, 8, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacLarry, -1 diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 64821c9d9..2e23e9072 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -1,8 +1,8 @@ UnionCaveB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerPokemaniacAndrew: @@ -147,7 +147,7 @@ UnionCaveB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $3, $3, 7, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $b, $3, 8, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE @@ -155,13 +155,13 @@ UnionCaveB1F_MapEventHeader: warp_def $21, $3, 2, GROUP_UNION_CAVE_1F, MAP_UNION_CAVE_1F warp_def $1f, $11, 1, GROUP_UNION_CAVE_B2F, MAP_UNION_CAVE_B2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 7 person_event SPRITE_POKEFAN_M, 8, 13, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerPhillip, -1 person_event SPRITE_POKEFAN_M, 11, 20, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerLeonard, -1 diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 8074053ac..b97276ce7 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -1,8 +1,8 @@ UnionCaveB2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -140,17 +140,17 @@ UnionCaveB2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $3, $5, 5, GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 6 person_event SPRITE_ROCKER, 23, 19, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermNick, -1 person_event SPRITE_COOLTRAINER_F, 17, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainerfGwen, -1 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index ad978bbfb..7b5a63afd 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -1,8 +1,8 @@ VermilionCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -265,7 +265,7 @@ VermilionCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 10 warp_def $5, $5, 1, GROUP_VERMILION_HOUSE_FISHING_SPEECH_HOUSE, MAP_VERMILION_HOUSE_FISHING_SPEECH_HOUSE warp_def $5, $9, 1, GROUP_VERMILION_POKECENTER_1F, MAP_VERMILION_POKECENTER_1F @@ -278,10 +278,10 @@ VermilionCity_MapEventHeader: warp_def $1f, $14, 2, GROUP_VERMILION_PORT_PASSAGE, MAP_VERMILION_PORT_PASSAGE warp_def $7, $22, 1, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 8 signpost 3, 25, SIGNPOST_READ, VermilionCitySign signpost 19, 5, SIGNPOST_READ, VermilionGymSign @@ -292,7 +292,7 @@ VermilionCity_MapEventHeader: signpost 13, 22, SIGNPOST_READ, VermilionCityMartSign signpost 19, 12, SIGNPOST_ITEM, MapVermilionCitySignpostItem7 - ; people-events +.PersonEvents: db 6 person_event SPRITE_TEACHER, 13, 22, OW_DOWN | $2, $11, -1, -1, $0, 0, TeacherScript_0x1aa983, -1 person_event SPRITE_GRAMPS, 10, 27, OW_LEFT | $1, $0, -1, -1, $0, 0, GrampsScript_0x1aa986, -1 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 2d0913223..4b637c1d3 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -1,8 +1,8 @@ VermilionGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SurgeScript_0x1920a5: @@ -257,15 +257,15 @@ VermilionGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $11, $4, 7, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $11, $5, 7, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 17 signpost 7, 1, SIGNPOST_READ, MapVermilionGymSignpost14Script signpost 7, 3, SIGNPOST_READ, MapVermilionGymSignpost14Script @@ -285,7 +285,7 @@ VermilionGym_MapEventHeader: signpost 15, 3, SIGNPOST_READ, VermilionGymStatue signpost 15, 6, SIGNPOST_READ, VermilionGymStatue - ; people-events +.PersonEvents: db 5 person_event SPRITE_SURGE, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, SurgeScript_0x1920a5, -1 person_event SPRITE_GENTLEMAN, 12, 12, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerGentlemanGregory, -1 diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index 08487374e..2fa1fc65f 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -1,8 +1,8 @@ VermilionHouseDiglettsCaveSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GentlemanScript_0x192031: @@ -21,17 +21,17 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 6, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $7, $3, 6, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_GENTLEMAN, 7, 5, OW_UP | $0, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x192031, -1 diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm index 5a0440767..48c4c8cbb 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionHouseFishingSpeechHouse.asm @@ -1,8 +1,8 @@ VermilionHouseFishingSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FishingDude: @@ -51,18 +51,18 @@ VermilionHouseFishingSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $7, $3, 1, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 signpost 0, 3, SIGNPOST_READ, FishingDudesHousePhoto - ; people-events +.PersonEvents: db 1 person_event SPRITE_FISHING_GURU, 8, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FishingDude, -1 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index 6da579553..d76778627 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -1,8 +1,8 @@ VermilionMagnetTrainSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanFScript_0x191eb7: @@ -33,20 +33,20 @@ VermilionMagnetTrainSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $7, $3, 4, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 1, 0, SIGNPOST_READ, VermilionMagnetTrainSpeechHouseBookshelf signpost 1, 1, SIGNPOST_READ, VermilionMagnetTrainSpeechHouseBookshelf - ; people-events +.PersonEvents: db 2 person_event SPRITE_POKEFAN_F, 7, 6, OW_LEFT | $0, $0, -1, -1, $0, 0, PokefanFScript_0x191eb7, -1 person_event SPRITE_YOUNGSTER, 7, 4, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x191eba, -1 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index e039d71d0..2054323ff 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -1,8 +1,8 @@ VermilionMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x191f7e: @@ -35,18 +35,18 @@ VermilionMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 5, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $7, $3, 5, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x191f7e, -1 person_event SPRITE_SUPER_NERD, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x191f85, -1 diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm index 4009a0014..bb9457982 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokeCenter1F.asm @@ -1,8 +1,8 @@ VermilionPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x191603: @@ -74,19 +74,19 @@ VermilionPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 2, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $7, $4, 2, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x191603, -1 person_event SPRITE_FISHING_GURU, 6, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FishingGuruScript_0x191606, -1 diff --git a/maps/VermilionPokeCenter2FBeta.asm b/maps/VermilionPokeCenter2FBeta.asm index de245eef7..f3a435000 100644 --- a/maps/VermilionPokeCenter2FBeta.asm +++ b/maps/VermilionPokeCenter2FBeta.asm @@ -1,23 +1,23 @@ VermilionPokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 VermilionPokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_VERMILION_POKECENTER_1F, MAP_VERMILION_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 0c6074358..07e6ae00c 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -1,12 +1,12 @@ VermilionPort_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -302,20 +302,20 @@ VermilionPort_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $5, $9, 5, GROUP_VERMILION_PORT_PASSAGE, MAP_VERMILION_PORT_PASSAGE warp_def $11, $7, 1, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $b, $7, $0, UnknownScript_0x74e20, $0, $0 - ; signposts +.Signposts: db 1 signpost 13, 16, SIGNPOST_ITEM, MapVermilionPortSignpostItem0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_SAILOR, 21, 11, OW_UP | $3, $0, -1, -1, $0, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY person_event SPRITE_SAILOR, 15, 10, OW_LEFT | $1, $0, -1, -1, $0, 0, SailorScript_0x74e97, -1 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 9faaa6d24..8ac0b8694 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -1,8 +1,8 @@ VermilionPortPassage_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x7701a: @@ -19,7 +19,7 @@ VermilionPortPassage_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $0, $f, 8, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $0, $10, 9, GROUP_VERMILION_CITY, MAP_VERMILION_CITY @@ -27,12 +27,12 @@ VermilionPortPassage_MapEventHeader: warp_def $2, $3, 3, GROUP_VERMILION_PORT_PASSAGE, MAP_VERMILION_PORT_PASSAGE warp_def $e, $3, 1, GROUP_VERMILION_PORT, MAP_VERMILION_PORT - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_TEACHER, 5, 21, OW_LEFT | $0, $0, -1, -1, $0, 0, TeacherScript_0x7701a, -1 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 5c686eb74..509bd0303 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -1,12 +1,12 @@ VictoryRoad_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x74490, $0000 dw UnknownScript_0x74491, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x74490: @@ -238,7 +238,7 @@ VictoryRoad_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 10 warp_def $43, $9, 5, GROUP_VICTORY_ROAD_GATE, MAP_VICTORY_ROAD_GATE warp_def $31, $1, 3, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD @@ -251,17 +251,17 @@ VictoryRoad_MapEventHeader: warp_def $1b, $0, 8, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD warp_def $5, $d, 3, GROUP_ROUTE_23, MAP_ROUTE_23 - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $8, $c, $0, UnknownScript_0x74492, $0, $0 xy_trigger 0, $8, $d, $0, UnknownScript_0x744b5, $0, $0 - ; signposts +.Signposts: db 2 signpost 29, 3, SIGNPOST_ITEM, MapVictoryRoadSignpostItem0 signpost 65, 3, SIGNPOST_ITEM, MapVictoryRoadSignpostItem1 - ; people-events +.PersonEvents: db 6 person_event SPRITE_SILVER, 17, 22, OW_UP | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD person_event SPRITE_POKE_BALL, 32, 7, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x74529, EVENT_VICTORY_ROAD_TM_EARTHQUAKE diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 79badb927..c57b2251e 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -1,12 +1,12 @@ VictoryRoadGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x9b9fb, $0000 dw UnknownScript_0x9b9fc, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x9b9fb: @@ -98,7 +98,7 @@ VictoryRoadGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 8 warp_def $7, $11, 1, GROUP_ROUTE_22, MAP_ROUTE_22 warp_def $7, $12, 1, GROUP_ROUTE_22, MAP_ROUTE_22 @@ -109,14 +109,14 @@ VictoryRoadGate_MapEventHeader: warp_def $7, $1, 2, GROUP_ROUTE_28, MAP_ROUTE_28 warp_def $7, $2, 2, GROUP_ROUTE_28, MAP_ROUTE_28 - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $b, $a, $0, UnknownScript_0x9b9fd, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_OFFICER, 15, 12, OW_LEFT | $1, $0, -1, -1, $0, 0, OfficerScript_0x9ba03, -1 person_event SPRITE_BLACK_BELT, 9, 11, OW_LEFT | $1, $0, -1, -1, $0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 08cd15d21..5adefc5d2 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -1,8 +1,8 @@ VioletCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -274,7 +274,7 @@ VioletCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 9 warp_def $11, $9, 2, GROUP_VIOLET_MART, MAP_VIOLET_MART warp_def $11, $12, 1, GROUP_VIOLET_GYM, MAP_VIOLET_GYM @@ -286,10 +286,10 @@ VioletCity_MapEventHeader: warp_def $18, $27, 1, GROUP_ROUTE_31_VIOLET_GATE, MAP_ROUTE_31_VIOLET_GATE warp_def $19, $27, 2, GROUP_ROUTE_31_VIOLET_GATE, MAP_ROUTE_31_VIOLET_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 7 signpost 20, 24, SIGNPOST_READ, VioletCitySign signpost 17, 15, SIGNPOST_READ, VioletGymSign @@ -299,7 +299,7 @@ VioletCity_MapEventHeader: signpost 17, 10, SIGNPOST_READ, VioletCityMartSign signpost 14, 37, SIGNPOST_ITEM, MapVioletCitySignpostItem6 - ; people-events +.PersonEvents: db 8 person_event SPRITE_FISHER, 20, 17, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a83bb, EVENT_VIOLET_CITY_EARL person_event SPRITE_LASS, 32, 32, OW_DOWN | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x1a8403, -1 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 941c5561b..a2201c4c5 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -1,8 +1,8 @@ VioletGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FalknerScript_0x683c2: @@ -279,20 +279,20 @@ VioletGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $f, $4, 2, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $f, $5, 2, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 13, 3, SIGNPOST_READ, VioletGymStatue signpost 13, 6, SIGNPOST_READ, VioletGymStatue - ; people-events +.PersonEvents: db 4 person_event SPRITE_FALKNER, 5, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FalknerScript_0x683c2, -1 person_event SPRITE_YOUNGSTER, 10, 11, OW_LEFT | $0, $2, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperRod, -1 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index dfe0f7e9f..23bc3d6a4 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -1,8 +1,8 @@ VioletMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x68295: @@ -47,18 +47,18 @@ VioletMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $7, $3, 1, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x68295, -1 person_event SPRITE_GRANNY, 10, 11, OW_UP | $1, $1, -1, -1, $0, 0, GrannyScript_0x6829c, -1 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 6b1fadd3d..9545c6e36 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -1,8 +1,8 @@ VioletNicknameSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x693e9: @@ -43,18 +43,18 @@ VioletNicknameSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $3, 4, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $7, $4, 4, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_TEACHER, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, TeacherScript_0x693e9, -1 person_event SPRITE_LASS, 8, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x693ec, -1 diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm index ddd30edaa..c92b5632a 100644 --- a/maps/VioletOnixTradeHouse.asm +++ b/maps/VioletOnixTradeHouse.asm @@ -1,8 +1,8 @@ VioletOnixTradeHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x6998d: @@ -32,18 +32,18 @@ VioletOnixTradeHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $3, 6, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $7, $4, 6, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 person_event SPRITE_POKEFAN_M, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, PokefanMScript_0x6998d, -1 person_event SPRITE_YOUNGSTER, 9, 10, OW_UP | $0, $20, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x69990, -1 diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index 940bac771..284094753 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -1,8 +1,8 @@ VioletPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x694c9: @@ -212,19 +212,19 @@ VioletPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 5, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $7, $4, 5, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 5 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x694c9, -1 person_event SPRITE_GAMEBOY_KID, 10, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GameboyKidScript_0x69540, -1 diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 726f70498..8d748a8e3 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -1,8 +1,8 @@ ViridianCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -215,7 +215,7 @@ ViridianCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $7, $20, 1, GROUP_VIRIDIAN_GYM, MAP_VIRIDIAN_GYM warp_def $9, $15, 1, GROUP_VIRIDIAN_NICKNAME_SPEECH_HOUSE, MAP_VIRIDIAN_NICKNAME_SPEECH_HOUSE @@ -223,10 +223,10 @@ ViridianCity_MapEventHeader: warp_def $13, $1d, 2, GROUP_VIRIDIAN_MART, MAP_VIRIDIAN_MART warp_def $19, $17, 1, GROUP_VIRIDIAN_POKECENTER_1F, MAP_VIRIDIAN_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 signpost 17, 17, SIGNPOST_READ, ViridianCitySign signpost 7, 27, SIGNPOST_READ, ViridianGymSign @@ -235,7 +235,7 @@ ViridianCity_MapEventHeader: signpost 25, 24, SIGNPOST_READ, ViridianCityPokeCenterSign signpost 19, 30, SIGNPOST_READ, ViridianCityMartSign - ; people-events +.PersonEvents: db 4 person_event SPRITE_GRAMPS, 9, 22, OW_DOWN | $2, $22, -1, -1, $0, 0, GrampsScript_0x1a9a4c, -1 person_event SPRITE_GRAMPS, 12, 34, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x1a9a61, -1 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index eb5a6706b..30aa729b2 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -1,8 +1,8 @@ ViridianGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 BlueScript_0x9aa26: @@ -168,20 +168,20 @@ ViridianGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $11, $4, 1, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY warp_def $11, $5, 1, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 signpost 13, 3, SIGNPOST_READ, ViridianGymStatue signpost 13, 6, SIGNPOST_READ, ViridianGymStatue - ; people-events +.PersonEvents: db 2 person_event SPRITE_BLUE, 7, 9, OW_UP | $2, $0, -1, -1, $0, 0, BlueScript_0x9aa26, EVENT_VIRIDIAN_GYM_BLUE person_event SPRITE_GYM_GUY, 17, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 7ba613b24..441cf81b7 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -1,8 +1,8 @@ ViridianMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x9b5e7: @@ -35,18 +35,18 @@ ViridianMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY warp_def $7, $3, 4, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x9b5e7, -1 person_event SPRITE_LASS, 6, 11, OW_UP | $1, $2, -1, -1, $0, 0, LassScript_0x9b5ee, -1 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 2c3bf7785..f6479e7c9 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -1,8 +1,8 @@ ViridianNicknameSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x9ae3a: @@ -59,18 +59,18 @@ ViridianNicknameSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY warp_def $7, $3, 2, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_POKEFAN_M, 8, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x9ae3a, -1 person_event SPRITE_LASS, 8, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x9ae3d, -1 diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm index a6646557f..7d72c8558 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokeCenter1F.asm @@ -1,8 +1,8 @@ ViridianPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x9b690: @@ -69,19 +69,19 @@ ViridianPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 5, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY warp_def $7, $4, 5, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x9b690, -1 person_event SPRITE_COOLTRAINER_M, 8, 12, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x9b693, -1 diff --git a/maps/ViridianPokeCenter2FBeta.asm b/maps/ViridianPokeCenter2FBeta.asm index 71899935c..9140390db 100644 --- a/maps/ViridianPokeCenter2FBeta.asm +++ b/maps/ViridianPokeCenter2FBeta.asm @@ -1,23 +1,23 @@ ViridianPokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ViridianPokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_VIRIDIAN_POKECENTER_1F, MAP_VIRIDIAN_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 33d2f9a1c..b1c32d372 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -1,8 +1,8 @@ WarehouseEntrance_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 3 ; callbacks @@ -647,7 +647,7 @@ WarehouseEntrance_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $2, $3, 7, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES warp_def $22, $3, 4, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES @@ -656,10 +656,10 @@ WarehouseEntrance_MapEventHeader: warp_def $1f, $16, 3, GROUP_WAREHOUSE_ENTRANCE, MAP_WAREHOUSE_ENTRANCE warp_def $1b, $16, 1, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 5 signpost 6, 18, SIGNPOST_READ, BasementDoorScript signpost 6, 19, SIGNPOST_READ, MapWarehouseEntranceSignpost1Script @@ -667,7 +667,7 @@ WarehouseEntrance_MapEventHeader: signpost 18, 4, SIGNPOST_ITEM, MapWarehouseEntranceSignpostItem3 signpost 8, 17, SIGNPOST_ITEM, MapWarehouseEntranceSignpostItem4 - ; people-events +.PersonEvents: db 9 person_event SPRITE_SUPER_NERD, 35, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerSupernerdEric, -1 person_event SPRITE_SUPER_NERD, 13, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerSupernerdTeru, -1 diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 049512896..bfa027695 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -1,8 +1,8 @@ WhirlIslandB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18c410: @@ -39,7 +39,7 @@ WhirlIslandB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 9 warp_def $5, $5, 2, GROUP_WHIRL_ISLAND_NW, MAP_WHIRL_ISLAND_NW warp_def $3, $23, 2, GROUP_WHIRL_ISLAND_NE, MAP_WHIRL_ISLAND_NE @@ -51,16 +51,16 @@ WhirlIslandB1F_MapEventHeader: warp_def $1b, $d, 2, GROUP_WHIRL_ISLAND_B2F, MAP_WHIRL_ISLAND_B2F warp_def $15, $11, 1, GROUP_WHIRL_ISLAND_CAVE, MAP_WHIRL_ISLAND_CAVE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 signpost 4, 30, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem0 signpost 18, 36, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem1 signpost 23, 2, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem2 - ; people-events +.PersonEvents: db 6 person_event SPRITE_POKE_BALL, 17, 11, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c410, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE person_event SPRITE_POKE_BALL, 22, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c412, EVENT_WHIRL_ISLAND_B1F_CARBOS diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index d9455654c..87fd91dec 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -1,8 +1,8 @@ WhirlIslandB2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18c4b8: @@ -18,20 +18,20 @@ WhirlIslandB2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $5, $b, 7, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F warp_def $b, $7, 8, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F warp_def $19, $7, 1, GROUP_WHIRL_ISLAND_LUGIA_CHAMBER, MAP_WHIRL_ISLAND_LUGIA_CHAMBER warp_def $1f, $d, 5, GROUP_WHIRL_ISLAND_SW, MAP_WHIRL_ISLAND_SW - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 person_event SPRITE_POKE_BALL, 15, 14, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4b8, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE person_event SPRITE_POKE_BALL, 8, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4ba, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index 019c2ca28..af104ab9d 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -1,24 +1,24 @@ WhirlIslandCave_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 WhirlIslandCave_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $5, $7, 9, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F warp_def $d, $3, 4, GROUP_WHIRL_ISLAND_NW, MAP_WHIRL_ISLAND_NW - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 6f43e0046..a1edf2f24 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -1,8 +1,8 @@ WhirlIslandLugiaChamber_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -47,16 +47,16 @@ WhirlIslandLugiaChamber_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $d, $9, 3, GROUP_WHIRL_ISLAND_B2F, MAP_WHIRL_ISLAND_B2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_LUGIA, 9, 13, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LugiaScript_0x18c518, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 8fffb150f..bc57e4957 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -1,8 +1,8 @@ WhirlIslandNE_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18c396: @@ -12,18 +12,18 @@ WhirlIslandNE_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $d, $3, 2, GROUP_ROUTE_41, MAP_ROUTE_41 warp_def $3, $11, 2, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F warp_def $b, $d, 3, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_POKE_BALL, 15, 15, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c396, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index bf3526319..5a9da92be 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -1,26 +1,26 @@ WhirlIslandNW_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 WhirlIslandNW_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $7, $5, 1, GROUP_ROUTE_41, MAP_ROUTE_41 warp_def $3, $5, 1, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F warp_def $f, $3, 4, GROUP_WHIRL_ISLAND_SW, MAP_WHIRL_ISLAND_SW warp_def $f, $7, 2, GROUP_WHIRL_ISLAND_CAVE, MAP_WHIRL_ISLAND_CAVE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index 99bdd5207..ebea7cafc 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -1,24 +1,24 @@ WhirlIslandSE_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 WhirlIslandSE_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $d, $5, 4, GROUP_ROUTE_41, MAP_ROUTE_41 warp_def $3, $5, 6, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 27be215bc..d93bf14ea 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -1,8 +1,8 @@ WhirlIslandSW_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18c3bc: @@ -12,7 +12,7 @@ WhirlIslandSW_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $7, $5, 3, GROUP_ROUTE_41, MAP_ROUTE_41 warp_def $3, $11, 5, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F @@ -20,12 +20,12 @@ WhirlIslandSW_MapEventHeader: warp_def $f, $3, 3, GROUP_WHIRL_ISLAND_NW, MAP_WHIRL_ISLAND_NW warp_def $f, $11, 4, GROUP_WHIRL_ISLAND_B2F, MAP_WHIRL_ISLAND_B2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_POKE_BALL, 6, 19, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c3bc, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 506d042ea..2cde824e9 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -1,12 +1,12 @@ WillsRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x1804c6, $0000 dw UnknownScript_0x1804ca, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -134,18 +134,18 @@ WillsRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $11, $5, 4, GROUP_INDIGO_PLATEAU_POKECENTER_1F, MAP_INDIGO_PLATEAU_POKECENTER_1F warp_def $2, $4, 1, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM warp_def $2, $5, 2, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_WILL, 11, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, WillScript_0x1804f8, -1 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 33c0de20e..87524c1b4 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -1,12 +1,12 @@ WiseTriosRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x98572, $0000 dw UnknownScript_0x98573, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -345,20 +345,20 @@ WiseTriosRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $4, $7, 4, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $5, $7, 5, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $4, $1, 5, GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $4, $7, $0, UnknownScript_0x985a3, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 6 person_event SPRITE_SAGE, 6, 10, OW_DOWN | $3, $0, -1, -1, $0, 0, SageScript_0x9859a, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 person_event SPRITE_SAGE, 11, 10, OW_UP | $1, $1, -1, -1, $0, 0, SageScript_0x9859d, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 diff --git a/predef/sgb.asm b/predef/sgb.asm index d870af2a6..5db1c14bd 100644 --- a/predef/sgb.asm +++ b/predef/sgb.asm @@ -551,7 +551,7 @@ Function8a0c: ; 8a0c ret .asm_8a16 - ld a, [wRoofPalette] + ld a, [wPermission] cp $2 jr z, .asm_8a39 cp $4 @@ -1550,7 +1550,7 @@ wd195:: ds 1 wd196:: ds 1 wd197:: ds 2 wd199:: ds 1 -wRoofPalette:: ds 3 +wPermission:: ds 3 ; width/height are in blocks (2x2 walkable tiles, 4x4 graphics tiles) MapHeader:: ; d19d |