pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

maptrigger macro

Browse Source
This commit is contained in:
PikalaxALT 2016-01-05 08:46:37 -05:00
parent 27be0bfe05
commit 80aba7fc13
47 changed files with 345 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
constants/landmark_constants.asm
View File

@ -1,102 +1,102 @@
const_def const_def
const SPECIAL_MAP const SPECIAL_MAP ; 00
const NEW_BARK_TOWN const NEW_BARK_TOWN ; 01
const ROUTE_29 const ROUTE_29 ; 02
const CHERRYGROVE_CITY const CHERRYGROVE_CITY ; 03
const ROUTE_30 const ROUTE_30 ; 04
const ROUTE_31 const ROUTE_31 ; 05
const VIOLET_CITY const VIOLET_CITY ; 06
const SPROUT_TOWER const SPROUT_TOWER ; 07
const ROUTE_32 const ROUTE_32 ; 08
const RUINS_OF_ALPH const RUINS_OF_ALPH ; 09
const UNION_CAVE const UNION_CAVE ; 0a
const ROUTE_33 const ROUTE_33 ; 0b
const AZALEA_TOWN const AZALEA_TOWN ; 0c
const SLOWPOKE_WELL const SLOWPOKE_WELL ; 0d
const ILEX_FOREST const ILEX_FOREST ; 0e
const ROUTE_34 const ROUTE_34 ; 0f
const GOLDENROD_CITY const GOLDENROD_CITY ; 10
const RADIO_TOWER const RADIO_TOWER ; 11
const ROUTE_35 const ROUTE_35 ; 12
const NATIONAL_PARK const NATIONAL_PARK ; 13
const ROUTE_36 const ROUTE_36 ; 14
const ROUTE_37 const ROUTE_37 ; 15
const ECRUTEAK_CITY const ECRUTEAK_CITY ; 16
const TIN_TOWER const TIN_TOWER ; 17
const BURNED_TOWER const BURNED_TOWER ; 18
const ROUTE_38 const ROUTE_38 ; 19
const ROUTE_39 const ROUTE_39 ; 1a
const OLIVINE_CITY const OLIVINE_CITY ; 1b
const LIGHTHOUSE const LIGHTHOUSE ; 1c
const BATTLE_TOWER const BATTLE_TOWER ; 1d
const ROUTE_40 const ROUTE_40 ; 1e
const WHIRL_ISLANDS const WHIRL_ISLANDS ; 1f
const ROUTE_41 const ROUTE_41 ; 20
const CIANWOOD_CITY const CIANWOOD_CITY ; 21
const ROUTE_42 const ROUTE_42 ; 22
const MT_MORTAR const MT_MORTAR ; 23
const MAHOGANY_TOWN const MAHOGANY_TOWN ; 24
const ROUTE_43 const ROUTE_43 ; 25
const LAKE_OF_RAGE const LAKE_OF_RAGE ; 26
const ROUTE_44 const ROUTE_44 ; 27
const ICE_PATH const ICE_PATH ; 28
const BLACKTHORN_CITY const BLACKTHORN_CITY ; 29
const DRAGONS_DEN const DRAGONS_DEN ; 2a
const ROUTE_45 const ROUTE_45 ; 2b
const DARK_CAVE const DARK_CAVE ; 2c
const ROUTE_46 const ROUTE_46 ; 2d
const SILVER_CAVE const SILVER_CAVE ; 2e
KANTO_LANDMARK EQU const_value KANTO_LANDMARK EQU const_value
const PALLET_TOWN const PALLET_TOWN ; 2f
const ROUTE_1 const ROUTE_1 ; 30
const VIRIDIAN_CITY const VIRIDIAN_CITY ; 31
const ROUTE_2 const ROUTE_2 ; 32
const PEWTER_CITY const PEWTER_CITY ; 33
const ROUTE_3 const ROUTE_3 ; 34
const MT_MOON const MT_MOON ; 35
const ROUTE_4 const ROUTE_4 ; 36
const CERULEAN_CITY const CERULEAN_CITY ; 37
const ROUTE_24 const ROUTE_24 ; 38
const ROUTE_25 const ROUTE_25 ; 39
const ROUTE_5 const ROUTE_5 ; 3a
const UNDERGROUND const UNDERGROUND ; 3b
const ROUTE_6 const ROUTE_6 ; 3c
const VERMILION_CITY const VERMILION_CITY ; 3d
const DIGLETTS_CAVE const DIGLETTS_CAVE ; 3e
const ROUTE_7 const ROUTE_7 ; 3f
const ROUTE_8 const ROUTE_8 ; 40
const ROUTE_9 const ROUTE_9 ; 41
const ROCK_TUNNEL const ROCK_TUNNEL ; 42
const ROUTE_10 const ROUTE_10 ; 43
const POWER_PLANT const POWER_PLANT ; 44
const LAVENDER_TOWN const LAVENDER_TOWN ; 45
const LAV_RADIO_TOWER const LAV_RADIO_TOWER ; 46
const CELADON_CITY const CELADON_CITY ; 47
const SAFFRON_CITY const SAFFRON_CITY ; 48
const ROUTE_11 const ROUTE_11 ; 49
const ROUTE_12 const ROUTE_12 ; 4a
const ROUTE_13 const ROUTE_13 ; 4b
const ROUTE_14 const ROUTE_14 ; 4c
const ROUTE_15 const ROUTE_15 ; 4d
const ROUTE_16 const ROUTE_16 ; 4e
const ROUTE_17 const ROUTE_17 ; 4f
const ROUTE_18 const ROUTE_18 ; 50
const FUCHSIA_CITY const FUCHSIA_CITY ; 51
const ROUTE_19 const ROUTE_19 ; 52
const ROUTE_20 const ROUTE_20 ; 53
const SEAFOAM_ISLANDS const SEAFOAM_ISLANDS ; 54
const CINNABAR_ISLAND const CINNABAR_ISLAND ; 55
const ROUTE_21 const ROUTE_21 ; 56
const ROUTE_22 const ROUTE_22 ; 57
const VICTORY_ROAD const VICTORY_ROAD ; 58
const ROUTE_23 const ROUTE_23 ; 59
const INDIGO_PLATEAU const INDIGO_PLATEAU ; 5a
const ROUTE_26 const ROUTE_26 ; 5b
const ROUTE_27 const ROUTE_27 ; 5c
const TOHJO_FALLS const TOHJO_FALLS ; 5d
const ROUTE_28 const ROUTE_28 ; 5e
const FAST_SHIP const FAST_SHIP ; 5f

208
constants/music_constants.asm
View File

@ -1,107 +1,107 @@
const_def const_def
const MUSIC_NONE const MUSIC_NONE ; 00
const MUSIC_TITLE const MUSIC_TITLE ; 01
const MUSIC_ROUTE_1 const MUSIC_ROUTE_1 ; 02
const MUSIC_ROUTE_3 const MUSIC_ROUTE_3 ; 03
const MUSIC_ROUTE_12 const MUSIC_ROUTE_12 ; 04
const MUSIC_MAGNET_TRAIN const MUSIC_MAGNET_TRAIN ; 05
const MUSIC_KANTO_GYM_LEADER_BATTLE const MUSIC_KANTO_GYM_LEADER_BATTLE ; 06
const MUSIC_KANTO_TRAINER_BATTLE const MUSIC_KANTO_TRAINER_BATTLE ; 07
const MUSIC_KANTO_WILD_BATTLE const MUSIC_KANTO_WILD_BATTLE ; 08
const MUSIC_POKEMON_CENTER const MUSIC_POKEMON_CENTER ; 09
const MUSIC_HIKER_ENCOUNTER const MUSIC_HIKER_ENCOUNTER ; 0a
const MUSIC_LASS_ENCOUNTER const MUSIC_LASS_ENCOUNTER ; 0b
const MUSIC_OFFICER_ENCOUNTER const MUSIC_OFFICER_ENCOUNTER ; 0c
const MUSIC_HEAL const MUSIC_HEAL ; 0d
const MUSIC_LAVENDER_TOWN const MUSIC_LAVENDER_TOWN ; 0e
const MUSIC_ROUTE_2 const MUSIC_ROUTE_2 ; 0f
const MUSIC_MT_MOON const MUSIC_MT_MOON ; 10
const MUSIC_SHOW_ME_AROUND const MUSIC_SHOW_ME_AROUND ; 11
const MUSIC_GAME_CORNER const MUSIC_GAME_CORNER ; 12
const MUSIC_BICYCLE const MUSIC_BICYCLE ; 13
const MUSIC_HALL_OF_FAME const MUSIC_HALL_OF_FAME ; 14
const MUSIC_VIRIDIAN_CITY const MUSIC_VIRIDIAN_CITY ; 15
const MUSIC_CELADON_CITY const MUSIC_CELADON_CITY ; 16
const MUSIC_TRAINER_VICTORY const MUSIC_TRAINER_VICTORY ; 17
const MUSIC_WILD_VICTORY const MUSIC_WILD_VICTORY ; 18
const MUSIC_GYM_VICTORY const MUSIC_GYM_VICTORY ; 19
const MUSIC_MT_MOON_SQUARE const MUSIC_MT_MOON_SQUARE ; 1a
const MUSIC_GYM const MUSIC_GYM ; 1b
const MUSIC_PALLET_TOWN const MUSIC_PALLET_TOWN ; 1c
const MUSIC_POKEMON_TALK const MUSIC_POKEMON_TALK ; 1d
const MUSIC_PROF_OAK const MUSIC_PROF_OAK ; 1e
const MUSIC_RIVAL_ENCOUNTER const MUSIC_RIVAL_ENCOUNTER ; 1f
const MUSIC_RIVAL_AFTER const MUSIC_RIVAL_AFTER ; 20
const MUSIC_SURF const MUSIC_SURF ; 21
const MUSIC_EVOLUTION const MUSIC_EVOLUTION ; 22
const MUSIC_NATIONAL_PARK const MUSIC_NATIONAL_PARK ; 23
const MUSIC_CREDITS const MUSIC_CREDITS ; 24
const MUSIC_AZALEA_TOWN const MUSIC_AZALEA_TOWN ; 25
const MUSIC_CHERRYGROVE_CITY const MUSIC_CHERRYGROVE_CITY ; 26
const MUSIC_KIMONO_ENCOUNTER const MUSIC_KIMONO_ENCOUNTER ; 27
const MUSIC_UNION_CAVE const MUSIC_UNION_CAVE ; 28
const MUSIC_JOHTO_WILD_BATTLE const MUSIC_JOHTO_WILD_BATTLE ; 29
const MUSIC_JOHTO_TRAINER_BATTLE const MUSIC_JOHTO_TRAINER_BATTLE ; 2a
const MUSIC_ROUTE_30 const MUSIC_ROUTE_30 ; 2b
const MUSIC_ECRUTEAK_CITY const MUSIC_ECRUTEAK_CITY ; 2c
const MUSIC_VIOLET_CITY const MUSIC_VIOLET_CITY ; 2d
const MUSIC_JOHTO_GYM_LEADER_BATTLE const MUSIC_JOHTO_GYM_LEADER_BATTLE ; 2e
const MUSIC_CHAMPION_BATTLE const MUSIC_CHAMPION_BATTLE ; 2f
const MUSIC_RIVAL_BATTLE const MUSIC_RIVAL_BATTLE ; 30
const MUSIC_ROCKET_BATTLE const MUSIC_ROCKET_BATTLE ; 31
const MUSIC_PROF_ELM const MUSIC_PROF_ELM ; 32
const MUSIC_DARK_CAVE const MUSIC_DARK_CAVE ; 33
const MUSIC_ROUTE_29 const MUSIC_ROUTE_29 ; 34
const MUSIC_ROUTE_36 const MUSIC_ROUTE_36 ; 35
const MUSIC_SS_AQUA const MUSIC_SS_AQUA ; 36
const MUSIC_YOUNGSTER_ENCOUNTER const MUSIC_YOUNGSTER_ENCOUNTER ; 37
const MUSIC_BEAUTY_ENCOUNTER const MUSIC_BEAUTY_ENCOUNTER ; 38
const MUSIC_ROCKET_ENCOUNTER const MUSIC_ROCKET_ENCOUNTER ; 39
const MUSIC_POKEMANIAC_ENCOUNTER const MUSIC_POKEMANIAC_ENCOUNTER ; 3a
const MUSIC_SAGE_ENCOUNTER const MUSIC_SAGE_ENCOUNTER ; 3b
const MUSIC_NEW_BARK_TOWN const MUSIC_NEW_BARK_TOWN ; 3c
const MUSIC_GOLDENROD_CITY const MUSIC_GOLDENROD_CITY ; 3d
const MUSIC_VERMILION_CITY const MUSIC_VERMILION_CITY ; 3e
const MUSIC_POKEMON_CHANNEL const MUSIC_POKEMON_CHANNEL ; 3f
const MUSIC_POKE_FLUTE_CHANNEL const MUSIC_POKE_FLUTE_CHANNEL ; 40
const MUSIC_TIN_TOWER const MUSIC_TIN_TOWER ; 41
const MUSIC_SPROUT_TOWER const MUSIC_SPROUT_TOWER ; 42
const MUSIC_BURNED_TOWER const MUSIC_BURNED_TOWER ; 43
const MUSIC_LIGHTHOUSE const MUSIC_LIGHTHOUSE ; 44
const MUSIC_LAKE_OF_RAGE const MUSIC_LAKE_OF_RAGE ; 45
const MUSIC_INDIGO_PLATEAU const MUSIC_INDIGO_PLATEAU ; 46
const MUSIC_ROUTE_37 const MUSIC_ROUTE_37 ; 47
const MUSIC_ROCKET_HIDEOUT const MUSIC_ROCKET_HIDEOUT ; 48
const MUSIC_DRAGONS_DEN const MUSIC_DRAGONS_DEN ; 49
const MUSIC_JOHTO_WILD_BATTLE_NIGHT const MUSIC_JOHTO_WILD_BATTLE_NIGHT ; 4a
const MUSIC_RUINS_OF_ALPH_RADIO const MUSIC_RUINS_OF_ALPH_RADIO ; 4b
const MUSIC_CAPTURE const MUSIC_CAPTURE ; 4c
const MUSIC_ROUTE_26 const MUSIC_ROUTE_26 ; 4d
const MUSIC_MOM const MUSIC_MOM ; 4e
const MUSIC_VICTORY_ROAD const MUSIC_VICTORY_ROAD ; 4f
const MUSIC_POKEMON_LULLABY const MUSIC_POKEMON_LULLABY ; 50
const MUSIC_POKEMON_MARCH const MUSIC_POKEMON_MARCH ; 51
const MUSIC_GS_OPENING const MUSIC_GS_OPENING ; 52
const MUSIC_GS_OPENING_2 const MUSIC_GS_OPENING_2 ; 53
const MUSIC_MAIN_MENU const MUSIC_MAIN_MENU ; 54
const MUSIC_RUINS_OF_ALPH_INTERIOR const MUSIC_RUINS_OF_ALPH_INTERIOR ; 55
const MUSIC_ROCKET_OVERTURE const MUSIC_ROCKET_OVERTURE ; 56
const MUSIC_DANCING_HALL const MUSIC_DANCING_HALL ; 57
const MUSIC_BUG_CATCHING_CONTEST_RANKING const MUSIC_BUG_CATCHING_CONTEST_RANKING ; 58
const MUSIC_BUG_CATCHING_CONTEST const MUSIC_BUG_CATCHING_CONTEST ; 59
const MUSIC_LAKE_OF_RAGE_ROCKET_RADIO const MUSIC_LAKE_OF_RAGE_ROCKET_RADIO ; 5a
const MUSIC_PRINTER const MUSIC_PRINTER ; 5b
const MUSIC_POST_CREDITS const MUSIC_POST_CREDITS ; 5c
const MUSIC_CLAIR const MUSIC_CLAIR ; 5d
const MUSIC_MOBILE_ADAPTER_MENU const MUSIC_MOBILE_ADAPTER_MENU ; 5e
const MUSIC_MOBILE_ADAPTER const MUSIC_MOBILE_ADAPTER ; 5f
const MUSIC_BUENAS_PASSWORD const MUSIC_BUENAS_PASSWORD ; 60
const MUSIC_MYSTICALMAN_ENCOUNTER const MUSIC_MYSTICALMAN_ENCOUNTER ; 61
const MUSIC_CRYSTAL_OPENING const MUSIC_CRYSTAL_OPENING ; 62
const MUSIC_BATTLE_TOWER_THEME const MUSIC_BATTLE_TOWER_THEME ; 63
const MUSIC_SUICUNE_BATTLE const MUSIC_SUICUNE_BATTLE ; 64
const MUSIC_BATTLE_TOWER_LOBBY const MUSIC_BATTLE_TOWER_LOBBY ; 65
const MUSIC_MOBILE_CENTER const MUSIC_MOBILE_CENTER ; 66
MUSIC_MAHOGANY_MART EQU 100 ; leftover from gold MUSIC_MAHOGANY_MART EQU $64 ; leftover from gold

2
engine/events.asm
View File

@ -502,7 +502,7 @@ CheckTimeEvents: ; 9693a
.do_daily .do_daily
callba CheckDailyResetTimer callba CheckDailyResetTimer
callba CheckPokerusTrick callba CheckPokerusTick
callba CheckPhoneCall callba CheckPhoneCall
ret c ret c

4
engine/options_menu.asm
View File

@ -5,8 +5,8 @@ _OptionsMenu: ; e41d0
ld [hl], $1 ld [hl], $1
call ClearBGPalettes call ClearBGPalettes
hlcoord 0, 0 hlcoord 0, 0
ld b, $10 ld b, 16
ld c, $12 ld c, 18
call TextBox call TextBox
hlcoord 2, 2 hlcoord 2, 2
ld de, StringOptions ld de, StringOptions

48
engine/pokegear.asm
View File

@ -213,14 +213,14 @@ Function90d70: ; 90d70 (24:4d70)
call GetWorldMapLocation call GetWorldMapLocation
.LoadLandmark .LoadLandmark
ld [wc6d8], a ld [wTownMapPlayerIconLandmark], a
ld [wc6d7], a ld [wTownMapCursorLandmark], a
ret ret
.FastShip .FastShip
ld [wc6d8], a ld [wTownMapPlayerIconLandmark], a
ld a, NEW_BARK_TOWN ld a, NEW_BARK_TOWN
ld [wc6d7], a ld [wTownMapCursorLandmark], a
ret ret
Function90d9e: ; 90d9e (24:4d9e) Function90d9e: ; 90d9e (24:4d9e)
@ -321,7 +321,7 @@ Function90e1a: ; 90e1a
Function90e3f: ; 90e3f Function90e3f: ; 90e3f
ld a, [wc6d8] ld a, [wTownMapPlayerIconLandmark]
cp FAST_SHIP cp FAST_SHIP
jr z, .johto jr z, .johto
cp KANTO_LANDMARK cp KANTO_LANDMARK
@ -341,7 +341,7 @@ Function90e3f: ; 90e3f
ld [hl], $6 ld [hl], $6
hlcoord 19, 2 hlcoord 19, 2
ld [hl], $17 ld [hl], $17
ld a, [wc6d7] ld a, [wTownMapCursorLandmark]
call Function910b4 call Function910b4
ret ret
; 90e72 ; 90e72
@ -547,7 +547,7 @@ UnknownText_0x90faf: ; 0x90faf
; 0x90fb4 ; 0x90fb4
Function90fb4: ; 90fb4 (24:4fb4) Function90fb4: ; 90fb4 (24:4fb4)
ld a, [wc6d8] ld a, [wTownMapPlayerIconLandmark]
cp FAST_SHIP cp FAST_SHIP
jr z, .johto jr z, .johto
cp KANTO_LANDMARK cp KANTO_LANDMARK
@ -567,9 +567,9 @@ Function90fb4: ; 90fb4 (24:4fb4)
Function90fcd: ; 90fcd (24:4fcd) Function90fcd: ; 90fcd (24:4fcd)
call Function90da8 call Function90da8
ld a, [wc6d8] ld a, [wTownMapPlayerIconLandmark]
call Function9106a call Function9106a
ld a, [wc6d7] ld a, [wTownMapCursorLandmark]
call Function91098 call Function91098
ld a, c ld a, c
ld [wc6d5], a ld [wc6d5], a
@ -580,7 +580,7 @@ Function90fcd: ; 90fcd (24:4fcd)
ret ret
Function90fe9: ; 90fe9 (24:4fe9) Function90fe9: ; 90fe9 (24:4fe9)
call Function910e8 call TownMap_GetKantoLandmarkLimits
jr Function90ff2 jr Function90ff2
Function90fee: ; 90fee (24:4fee) Function90fee: ; 90fee (24:4fee)
@ -637,7 +637,7 @@ Function9102f: ; 9102f (24:502f)
jr nz, .down jr nz, .down
ret ret
.up .up
ld hl, wc6d7 ld hl, wTownMapCursorLandmark
ld a, [hl] ld a, [hl]
cp d cp d
jr c, .asm_91047 jr c, .asm_91047
@ -649,7 +649,7 @@ Function9102f: ; 9102f (24:502f)
jr .done jr .done
.down .down
ld hl, wc6d7 ld hl, wTownMapCursorLandmark
ld a, [hl] ld a, [hl]
cp e cp e
jr nz, .asm_91054 jr nz, .asm_91054
@ -660,13 +660,13 @@ Function9102f: ; 9102f (24:502f)
dec [hl] dec [hl]
.done .done
ld a, [wc6d7] ld a, [wTownMapCursorLandmark]
call Function910b4 call Function910b4
ld a, [wc6d5] ld a, [wc6d5]
ld c, a ld c, a
ld a, [wc6d6] ld a, [wc6d6]
ld b, a ld b, a
ld a, [wc6d7] ld a, [wTownMapCursorLandmark]
call Function910d4 call Function910d4
ret ret
@ -747,17 +747,17 @@ Function910d4: ; 910d4
ret ret
; 910e8 ; 910e8
Function910e8: ; 910e8 TownMap_GetKantoLandmarkLimits: ; 910e8
ld a, [StatusFlags] ld a, [StatusFlags]
bit 6, a bit 6, a
jr z, .asm_910f4 jr z, .not_hof
ld d, $5e ld d, ROUTE_28
ld e, $2f ld e, PALLET_TOWN
ret ret
.asm_910f4 .not_hof
ld d, $5e ld d, ROUTE_28
ld e, $58 ld e, VICTORY_ROAD
ret ret
; 910f9 ; 910f9
@ -1558,7 +1558,7 @@ RadioChannels:
jp LoadStation_BuenasPassword jp LoadStation_BuenasPassword
.RuinsOfAlphRadio .RuinsOfAlphRadio
ld a, [wc6d8] ld a, [wTownMapPlayerIconLandmark]
cp RUINS_OF_ALPH cp RUINS_OF_ALPH
jr nz, .NoSignal jr nz, .NoSignal
jp LoadStation_UnownRadio jp LoadStation_UnownRadio
@ -1594,7 +1594,7 @@ RadioChannels:
bit 4, a bit 4, a
jr z, .NoSignal jr z, .NoSignal
ld a, [wc6d8] ld a, [wTownMapPlayerIconLandmark]
cp MAHOGANY_TOWN cp MAHOGANY_TOWN
jr z, .ok jr z, .ok
cp ROUTE_43 cp ROUTE_43
@ -1611,7 +1611,7 @@ RadioChannels:
.InJohto .InJohto
; if in Johto or on the S.S. Aqua, set carry ; if in Johto or on the S.S. Aqua, set carry
; otherwise clear carry ; otherwise clear carry
ld a, [wc6d8] ld a, [wTownMapPlayerIconLandmark]
cp FAST_SHIP cp FAST_SHIP
jr z, .johto jr z, .johto
cp KANTO_LANDMARK cp KANTO_LANDMARK

8
engine/save.asm
View File

@ -723,13 +723,13 @@ TryLoadSaveData: ; 14f1c
DefaultOptions: ; 14f7c DefaultOptions: ; 14f7c
db $03 ; mid text speed db $03 ; mid text speed
db $00 db $00 ; wSaveFileExists
db $00 ; frame 0 db $00 ; frame 0
db $01 db $01 ; TextBoxFlags
db $40 ; gb printer: normal brightness db $40 ; gb printer: normal brightness
db $01 ; menu account on db $01 ; menu account on
db $00 db $00 ; ??
db $00 db $00 ; ??
; 14f84 ; 14f84
CheckPrimarySaveFile: ; 14f84 CheckPrimarySaveFile: ; 14f84

2
engine/scripting.asm
View File

@ -1203,7 +1203,7 @@ ApplyPersonFacing: ; 9728b
jr c, .not_visible ; STILL_SPRITE jr c, .not_visible ; STILL_SPRITE
ld hl, OBJECT_FLAGS1 ld hl, OBJECT_FLAGS1
add hl, bc add hl, bc
bit 2, [hl] bit FIXED_FACING, [hl]
jr nz, .not_visible jr nz, .not_visible
pop de pop de
ld a, e ld a, e

2
engine/time.asm
View File

@ -195,7 +195,7 @@ InitializeStartDay: ; 114dd
ret ret
; 114e7 ; 114e7
CheckPokerusTrick:: ; 114e7 CheckPokerusTick:: ; 114e7
ld hl, wStartDay ld hl, wStartDay
call CalcDaysSince call CalcDaysSince
call GetDaysSince call GetDaysSince

14
engine/town_map.asm
View File

@ -45,23 +45,23 @@ _TownMap: ; 9191c
call SetPalettes call SetPalettes
ld a, [hCGB] ld a, [hCGB]
and a and a
jr z, .sgb jr z, .dmg
ld a, $e4 ld a, %11100100
call DmgToCgbObjPal0 call DmgToCgbObjPal0
call DelayFrame call DelayFrame
.sgb .dmg
ld a, [wd002] ld a, [wd002]
cp KANTO_LANDMARK cp KANTO_LANDMARK
jr nc, .kanto jr nc, .kanto
ld d, KANTO_LANDMARK - 1 ld d, KANTO_LANDMARK - 1
ld e, 1 ld e, 1
call Function919b0 call .loop
jr .resume jr .resume
.kanto .kanto
call Function910e8 call TownMap_GetKantoLandmarkLimits
call Function919b0 call .loop
.resume .resume
pop af pop af
@ -72,9 +72,7 @@ _TownMap: ; 9191c
ld [Options], a ld [Options], a
call ClearBGPalettes call ClearBGPalettes
ret ret
; 919b0
Function919b0: ; 919b0
.loop .loop
call JoyTextDelay call JoyTextDelay
ld hl, hJoyPressed ld hl, hJoyPressed

17
home/menu.asm
View File

@ -113,9 +113,8 @@ CopyNameFromMenu::
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
rept 2
inc hl inc hl
endr inc hl
pop af pop af
call GetNthString call GetNthString
ld d, h ld d, h
@ -444,9 +443,8 @@ PlaceNthMenuStrings:: ; 1f8d
push de push de
ld a, [MenuSelection] ld a, [MenuSelection]
call GetMenuDataPointerTableEntry call GetMenuDataPointerTableEntry
rept 2
inc hl inc hl
endr inc hl
ld a, [hli] ld a, [hli]
ld d, [hl] ld d, [hl]
ld e, a ld e, a
@ -458,9 +456,8 @@ endr
Function1f9e:: ; 1f9e Function1f9e:: ; 1f9e
; unreferenced ; unreferenced
call GetMenuDataPointerTableEntry call GetMenuDataPointerTableEntry
rept 2
inc hl inc hl
endr inc hl
ld a, [hli] ld a, [hli]
ld d, [hl] ld d, [hl]
ld e, a ld e, a
@ -483,9 +480,10 @@ GetMenuDataPointerTableEntry:: ; 1fb1
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
rept 4
add hl, de add hl, de
endr add hl, de
add hl, de
add hl, de
ret ret
; 1fbf ; 1fbf
@ -506,9 +504,8 @@ ClearWindowData:: ; 1fbf
xor a xor a
ld hl, wWindowStackBottom ld hl, wWindowStackBottom
rept 2
ld [hld], a ld [hld], a
endr ld [hld], a
ld a, l ld a, l
ld [wWindowStackPointer], a ld [wWindowStackPointer], a
ld a, h ld a, h

4
macros/map.asm
View File

@ -183,3 +183,7 @@ stonetable: MACRO
db \1, \2 db \1, \2
dw \3 dw \3
endm endm
maptrigger: MACRO
dw \1, 0
endm

6
maps/AzaleaTown.asm
View File

@ -17,9 +17,9 @@ AzaleaTown_MapScriptHeader:
db 3 db 3
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
dw .Trigger2, 0 maptrigger .Trigger2
.MapCallbacks: .MapCallbacks:
db 1 db 1

4
maps/BattleTower1F.asm
View File

@ -10,8 +10,8 @@ BattleTower1F_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 0 db 0

4
maps/BattleTowerElevator.asm
View File

@ -6,8 +6,8 @@ BattleTowerElevator_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 0 db 0

4
maps/BattleTowerHallway.asm
View File

@ -6,8 +6,8 @@ BattleTowerHallway_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 0 db 0

6
maps/BurnedTower1F.asm
View File

@ -10,9 +10,9 @@ BurnedTower1F_MapScriptHeader:
db 3 db 3
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
dw .Trigger2, 0 maptrigger .Trigger2
.MapCallbacks: .MapCallbacks:
db 1 db 1

4
maps/CherrygroveCity.asm
View File

@ -10,8 +10,8 @@ CherrygroveCity_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1

4
maps/CianwoodCity.asm
View File

@ -17,8 +17,8 @@ CianwoodCity_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1

6
maps/Colosseum.asm
View File

@ -7,9 +7,9 @@ Colosseum_MapScriptHeader:
db 3 db 3
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
dw .Trigger2, 0 maptrigger .Trigger2
.MapCallbacks: .MapCallbacks:
db 2 db 2

4
maps/DragonShrine.asm
View File

@ -9,8 +9,8 @@ DragonShrine_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 0 db 0

4
maps/DragonsDenB1F.asm
View File

@ -14,8 +14,8 @@ DragonsDenB1F_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1

4
maps/EcruteakHouse.asm
View File

@ -9,8 +9,8 @@ EcruteakHouse_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1

12
maps/ElmsLab.asm
View File

@ -11,12 +11,12 @@ ElmsLab_MapScriptHeader:
db 6 db 6
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
dw .Trigger2, 0 maptrigger .Trigger2
dw .Trigger3, 0 maptrigger .Trigger3
dw .Trigger4, 0 maptrigger .Trigger4
dw .Trigger5, 0 maptrigger .Trigger5
.MapCallbacks: .MapCallbacks:
db 1 db 1

6
maps/FastShip1F.asm
View File

@ -9,9 +9,9 @@ FastShip1F_MapScriptHeader:
db 3 db 3
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
dw .Trigger2, 0 maptrigger .Trigger2
.MapCallbacks: .MapCallbacks:
db 0 db 0

2
maps/GoldenrodMagnetTrainStation.asm
View File

@ -7,7 +7,7 @@ GoldenrodMagnetTrainStation_MapScriptHeader:
db 1 db 1
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
.MapCallbacks: .MapCallbacks:
db 0 db 0

4
maps/HallOfFame.asm
View File

@ -6,8 +6,8 @@ HallOfFame_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 0 db 0

4
maps/LakeofRage.asm
View File

@ -17,8 +17,8 @@ LakeofRage_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 2 db 2

4
maps/MahoganyTown.asm
View File

@ -9,8 +9,8 @@ MahoganyTown_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1

4
maps/MobileBattleRoom.asm
View File

@ -4,8 +4,8 @@ MobileBattleRoom_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 0 db 0

4
maps/MobileTradeRoomMobile.asm
View File

@ -4,8 +4,8 @@ MobileTradeRoomMobile_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 0 db 0

4
maps/MountMoon.asm
View File

@ -6,8 +6,8 @@ MountMoon_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 0 db 0

4
maps/NewBarkTown.asm
View File

@ -8,8 +8,8 @@ NewBarkTown_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1

4
maps/OlivineCity.asm
View File

@ -9,8 +9,8 @@ OlivineCity_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1

12
maps/PokeCenter2F.asm
View File

@ -9,12 +9,12 @@ PokeCenter2F_MapScriptHeader:
db 6 db 6
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
dw .Trigger2, 0 maptrigger .Trigger2
dw .Trigger3, 0 maptrigger .Trigger3
dw .Trigger4, 0 maptrigger .Trigger4
dw .Trigger5, 0 maptrigger .Trigger5
.MapCallbacks: .MapCallbacks:
db 0 db 0

6
maps/RadioTower5F.asm
View File

@ -10,9 +10,9 @@ RadioTower5F_MapScriptHeader:
db 3 db 3
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
dw .Trigger2, 0 maptrigger .Trigger2
.MapCallbacks: .MapCallbacks:
db 0 db 0

4
maps/Route29.asm
View File

@ -13,8 +13,8 @@ Route29_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1

6
maps/Route32.asm
View File

@ -19,9 +19,9 @@ Route32_MapScriptHeader:
db 3 db 3
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
dw .Trigger2, 0 maptrigger .Trigger2
.MapCallbacks: .MapCallbacks:
db 1 db 1

6
maps/Route36NationalParkgate.asm
View File

@ -17,9 +17,9 @@ Route36NationalParkgate_MapScriptHeader:
db 3 db 3
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
dw .Trigger2, 0 maptrigger .Trigger2
.MapCallbacks: .MapCallbacks:
db 2 db 2

2
maps/SaffronTrainStation.asm
View File

@ -9,7 +9,7 @@ SaffronTrainStation_MapScriptHeader:
db 1 db 1
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
.MapCallbacks: .MapCallbacks:
db 0 db 0

2
maps/TeamRocketBaseB1F.asm
View File

@ -11,7 +11,7 @@ TeamRocketBaseB1F_MapScriptHeader:
db 1 db 1
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
.MapCallbacks: .MapCallbacks:
db 1 db 1

8
maps/TeamRocketBaseB3F.asm
View File

@ -19,10 +19,10 @@ TeamRocketBaseB3F_MapScriptHeader:
db 4 db 4
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
dw .Trigger2, 0 maptrigger .Trigger2
dw .Trigger3, 0 maptrigger .Trigger3
.MapCallbacks: .MapCallbacks:
db 1 db 1

4
maps/TimeCapsule.asm
View File

@ -7,8 +7,8 @@ TimeCapsule_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1

4
maps/TradeCenter.asm
View File

@ -7,8 +7,8 @@ TradeCenter_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1

4
maps/UndergroundPathSwitchRoomEntrances.asm
View File

@ -48,8 +48,8 @@ UndergroundPathSwitchRoomEntrances_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1

4
maps/VermilionPort.asm
View File

@ -8,8 +8,8 @@ VermilionPort_MapScriptHeader:
db 2 db 2
; triggers ; triggers
dw .Trigger0, 0 maptrigger .Trigger0
dw .Trigger1, 0 maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1

21
maps/ViridianGym.asm
View File

@ -14,26 +14,26 @@ BlueScript_0x9aa26:
opentext opentext
checkflag ENGINE_EARTHBADGE checkflag ENGINE_EARTHBADGE
iftrue .FightDone iftrue .FightDone
writetext UnknownText_0x9aa7b writetext LeaderBlueBeforeText
waitbutton waitbutton
closetext closetext
winlosstext UnknownText_0x9abae, 0 winlosstext LeaderBlueWinText, 0
loadtrainer BLUE, 1 loadtrainer BLUE, 1
startbattle startbattle
reloadmapafterbattle reloadmapafterbattle
setevent EVENT_BEAT_BLUE setevent EVENT_BEAT_BLUE
opentext opentext
writetext UnknownText_0x9ac0f writetext Text_ReceivedEarthBadge
playsound SFX_GET_BADGE playsound SFX_GET_BADGE
waitsfx waitsfx
setflag ENGINE_EARTHBADGE setflag ENGINE_EARTHBADGE
writetext UnknownText_0x9ac27 writetext LeaderBlueAfterText
waitbutton waitbutton
closetext closetext
end end
.FightDone .FightDone
writetext UnknownText_0x9acab writetext LeaderBlueEpilogueText
waitbutton waitbutton
closetext closetext
end end
@ -58,11 +58,12 @@ ViridianGymStatue:
checkflag ENGINE_EARTHBADGE checkflag ENGINE_EARTHBADGE
iftrue .Beaten iftrue .Beaten
jumpstd gymstatue1 jumpstd gymstatue1
.Beaten .Beaten
trainertotext BLUE, 1, $1 trainertotext BLUE, 1, $1
jumpstd gymstatue2 jumpstd gymstatue2
UnknownText_0x9aa7b: LeaderBlueBeforeText:
text "BLUE: Yo! Finally" text "BLUE: Yo! Finally"
line "got here, huh?" line "got here, huh?"
@ -95,7 +96,7 @@ UnknownText_0x9aa7b:
line "CHAMP?" line "CHAMP?"
done done
UnknownText_0x9abae: LeaderBlueWinText:
text "BLUE: What?" text "BLUE: What?"
para "How the heck did I" para "How the heck did I"
@ -108,12 +109,12 @@ UnknownText_0x9abae:
cont "it's EARTHBADGE." cont "it's EARTHBADGE."
done done
UnknownText_0x9ac0f: Text_ReceivedEarthBadge:
text "<PLAYER> received" text "<PLAYER> received"
line "EARTHBADGE." line "EARTHBADGE."
done done
UnknownText_0x9ac27: LeaderBlueAfterText:
text "BLUE: …" text "BLUE: …"
para "All right, I was" para "All right, I was"
@ -129,7 +130,7 @@ UnknownText_0x9ac27:
line "it!" line "it!"
done done
UnknownText_0x9acab: LeaderBlueEpilogueText:
text "BLUE: Listen, you." text "BLUE: Listen, you."
para "You'd better not" para "You'd better not"

2
wram.asm
View File

@ -907,9 +907,11 @@ wc6d6::
EnemySpdLevel:: ; c6d6 EnemySpdLevel:: ; c6d6
ds 1 ds 1
wc6d7:: wc6d7::
wTownMapCursorLandmark::
EnemySAtkLevel:: ; c6d7 EnemySAtkLevel:: ; c6d7
ds 1 ds 1
wc6d8:: wc6d8::
wTownMapPlayerIconLandmark::
EnemySDefLevel:: ; c6d8 EnemySDefLevel:: ; c6d8
ds 1 ds 1
wc6d9:: wc6d9::