pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

underground switches, town map

Browse Source
This commit is contained in:
PikalaxALT
2015-12-09 11:38:40 -05:00
parent 5b7fc7b0fa
commit 7f68db68ad
42 changed files with 1655 additions and 1603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/billspc.asm
View File

@@ -2293,7 +2293,7 @@ Functione33d0: ; e33d0 (38:73d0)
ld a, $e4 ld a, $e4
call DmgToCgbBGPals call DmgToCgbBGPals
ld a, $fc ld a, $fc
call Functioncf8 call DmgToCgbObjPal0
ret ret
Functione33df: ; e33df (38:73df) Functione33df: ; e33df (38:73df)

2
engine/card_flip.asm
View File

@@ -1756,7 +1756,7 @@ Functione1190: ; e1190
ld a, $e4 ld a, $e4
call DmgToCgbBGPals call DmgToCgbBGPals
ld a, $24 ld a, $24
call Functioncf8 call DmgToCgbObjPal0
xor a xor a
ld [wd0ec], a ld [wd0ec], a
call DelayFrame call DelayFrame

2
engine/compose_mail.asm
View File

@@ -57,7 +57,7 @@ _ComposeMailMessage: ; 11e75 (mail?)
ld a, %11100100 ld a, %11100100
call DmgToCgbBGPals call DmgToCgbBGPals
ld a, %11100100 ld a, %11100100
call Functioncf8 call DmgToCgbObjPal0
call Function11be0 call Function11be0
ld hl, wc6d0 ld hl, wc6d0
ld e, [hl] ld e, [hl]

2
engine/dummy_game.asm
View File

@@ -39,7 +39,7 @@ Functione1e67: ; e1e67 (38:5e67)
ld a, $e4 ld a, $e4
call DmgToCgbBGPals call DmgToCgbBGPals
ld a, $e0 ld a, $e0
call Functioncf8 call DmgToCgbObjPal0
ret ret
Functione1ebb: ; e1ebb (38:5ebb) Functione1ebb: ; e1ebb (38:5ebb)

2
engine/healmachineanim.asm
View File

@@ -13,7 +13,7 @@ HealMachineAnim: ; 12324
ld [Buffer2], a ld [Buffer2], a
call .DoJumptableFunctions call .DoJumptableFunctions
ld a, [Buffer2] ld a, [Buffer2]
call Functiond24 call DmgToCgbObjPal1
ret ret
; 1233e ; 1233e

364
engine/more_phone_scripts.asm
View File

File diff suppressed because it is too large Load Diff

516
engine/phone_scripts.asm
View File

File diff suppressed because it is too large Load Diff

30
engine/pokedex.asm
View File

@@ -339,7 +339,7 @@ Function40217: ; 40217 (10:4217)
ret ret
Function40258: ; 40258 (10:4258) Function40258: ; 40258 (10:4258)
ld de, Unknown_402e8 ld de, DexEntryPage_JoypadCoords
call Function4135a call Function4135a
ld hl, hJoyPressed ; $ffa7 ld hl, hJoyPressed ; $ffa7
ld a, [hl] ld a, [hl]
@@ -355,7 +355,7 @@ Function40258: ; 40258 (10:4258)
.a .a
ld a, [wc7d8] ld a, [wc7d8]
ld hl, Jumptable_402f2 ld hl, DexEntryPage_Jumptable
call Pokedex_LoadPointer call Pokedex_LoadPointer
jp [hl] jp [hl]
@@ -373,7 +373,7 @@ Function40258: ; 40258 (10:4258)
ret ret
; 40292 (10:4292) ; 40292 (10:4292)
Function40292: ; 40292 Pokedex_Page: ; 40292
ld a, [wPokedexStatus] ld a, [wPokedexStatus]
xor $1 xor $1
ld [wPokedexStatus], a ld [wPokedexStatus], a
@@ -410,7 +410,7 @@ Function402aa: ; 402aa (10:42aa)
ret ret
; 402e8 (10:42e8) ; 402e8 (10:42e8)
Unknown_402e8: ; 402e8 DexEntryPage_JoypadCoords: ; 402e8
db D_RIGHT | D_LEFT, 4 db D_RIGHT | D_LEFT, 4
dwcoord 1, 17 dwcoord 1, 17
dwcoord 6, 17 dwcoord 6, 17
@@ -419,14 +419,14 @@ Unknown_402e8: ; 402e8
; 402f2 ; 402f2
Jumptable_402f2: ; 402f2 DexEntryPage_Jumptable: ; 402f2
dw Function40292 dw Pokedex_Page
dw Function402fa dw .Area
dw Function40340 dw .Cry
dw Function4034f dw .Print
; 402fa ; 402fa
Function402fa: ; 402fa .Area: ; 402fa
call Function41401 call Function41401
xor a xor a
ld [hSCX], a ld [hSCX], a
@@ -438,7 +438,7 @@ Function402fa: ; 402fa
call Pokedex_GetMonAtCursorPosition call Pokedex_GetMonAtCursorPosition
ld a, [wDexCurrentLocation] ld a, [wDexCurrentLocation]
ld e, a ld e, a
predef Function91d11 predef _Area
call Function41401 call Function41401
call DelayFrame call DelayFrame
xor a xor a
@@ -458,7 +458,7 @@ Function402fa: ; 402fa
ret ret
; 40340 ; 40340
Function40340: ; 40340 .Cry: ; 40340
call Pokedex_GetMonAtCursorPosition call Pokedex_GetMonAtCursorPosition
ld a, [wd265] ld a, [wd265]
call GetCryIndex call GetCryIndex
@@ -468,7 +468,7 @@ Function40340: ; 40340
ret ret
; 4034f ; 4034f
Function4034f: ; 4034f .Print: ; 4034f
call Function41415 call Function41415
xor a xor a
ld [hSCX], a ld [hSCX], a
@@ -2393,7 +2393,7 @@ Function41415: ; 41415
ld a, $ff ld a, $ff
call DmgToCgbBGPals call DmgToCgbBGPals
ld a, $ff ld a, $ff
call Functioncf8 call DmgToCgbObjPal0
call DelayFrame call DelayFrame
ret ret
@@ -2405,7 +2405,7 @@ Function41427: ; 41427
ld a, $e4 ld a, $e4
call DmgToCgbBGPals call DmgToCgbBGPals
ld a, $e0 ld a, $e0
call Functioncf8 call DmgToCgbObjPal0
ret ret
; 41432 ; 41432

295
engine/pokegear.asm
View File

File diff suppressed because it is too large Load Diff

2
engine/predef.asm
View File

@@ -80,7 +80,7 @@ PredefPointers:: ; 856b
add_predef Predef2F add_predef Predef2F
add_predef Function9853 ; $30 add_predef Function9853 ; $30
add_predef Predef_LoadSGBLayout add_predef Predef_LoadSGBLayout
add_predef Function91d11 add_predef _Area
add_predef CheckContestMon add_predef CheckContestMon
add_predef Predef_StartBattle add_predef Predef_StartBattle
add_predef Predef35 add_predef Predef35

4
engine/save.asm
View File

@@ -18,7 +18,7 @@ SaveMenu: ; 14a1a
.refused .refused
call ExitMenu call ExitMenu
call Functiond90 call ret_d90
callba SaveMenu_LoadEDTile callba SaveMenu_LoadEDTile
scf scf
ret ret
@@ -217,7 +217,7 @@ SaveTheGame_yesorno: ; 14baf
dec a dec a
call WriteBackup call WriteBackup
push af push af
call Functiond90 call ret_d90
pop af pop af
and a and a
ret ret

350
engine/scripting.asm
View File

@@ -70,178 +70,178 @@ RunScriptCommand: ; 96ca9
ScriptCommandTable: ; 96cb1 ScriptCommandTable: ; 96cb1
dw Script_scall dw Script_scall ; 00
dw Script_farscall dw Script_farscall ; 01
dw Script_ptcall dw Script_ptcall ; 02
dw Script_jump dw Script_jump ; 03
dw Script_farjump dw Script_farjump ; 04
dw Script_ptjump dw Script_ptjump ; 05
dw Script_if_equal dw Script_if_equal ; 06
dw Script_if_not_equal dw Script_if_not_equal ; 07
dw Script_iffalse dw Script_iffalse ; 08
dw Script_iftrue dw Script_iftrue ; 09
dw Script_if_greater_than dw Script_if_greater_than ; 0a
dw Script_if_less_than dw Script_if_less_than ; 0b
dw Script_jumpstd dw Script_jumpstd ; 0c
dw Script_callstd dw Script_callstd ; 0d
dw Script_callasm dw Script_callasm ; 0e
dw Script_special dw Script_special ; 0f
dw Script_ptcallasm dw Script_ptcallasm ; 10
dw Script_checkmaptriggers dw Script_checkmaptriggers ; 11
dw Script_domaptrigger dw Script_domaptrigger ; 12
dw Script_checktriggers dw Script_checktriggers ; 13
dw Script_dotrigger dw Script_dotrigger ; 14
dw Script_writebyte dw Script_writebyte ; 15
dw Script_addvar dw Script_addvar ; 16
dw Script_random dw Script_random ; 17
dw Script_checkver dw Script_checkver ; 18
dw Script_copybytetovar dw Script_copybytetovar ; 19
dw Script_copyvartobyte dw Script_copyvartobyte ; 1a
dw Script_loadvar dw Script_loadvar ; 1b
dw Script_checkcode dw Script_checkcode ; 1c
dw Script_writevarcode dw Script_writevarcode ; 1d
dw Script_writecode dw Script_writecode ; 1e
dw Script_giveitem dw Script_giveitem ; 1f
dw Script_takeitem dw Script_takeitem ; 20
dw Script_checkitem dw Script_checkitem ; 21
dw Script_givemoney dw Script_givemoney ; 22
dw Script_takemoney dw Script_takemoney ; 23
dw Script_checkmoney dw Script_checkmoney ; 24
dw Script_givecoins dw Script_givecoins ; 25
dw Script_takecoins dw Script_takecoins ; 26
dw Script_checkcoins dw Script_checkcoins ; 27
dw Script_addcellnum dw Script_addcellnum ; 28
dw Script_delcellnum dw Script_delcellnum ; 29
dw Script_checkcellnum dw Script_checkcellnum ; 2a
dw Script_checktime dw Script_checktime ; 2b
dw Script_checkpoke dw Script_checkpoke ; 2c
dw Script_givepoke dw Script_givepoke ; 2d
dw Script_giveegg dw Script_giveegg ; 2e
dw Script_givepokeitem dw Script_givepokeitem ; 2f
dw Script_checkpokeitem dw Script_checkpokeitem ; 30
dw Script_checkevent dw Script_checkevent ; 31
dw Script_clearevent dw Script_clearevent ; 32
dw Script_setevent dw Script_setevent ; 33
dw Script_checkflag dw Script_checkflag ; 34
dw Script_clearflag dw Script_clearflag ; 35
dw Script_setflag dw Script_setflag ; 36
dw Script_wildon dw Script_wildon ; 37
dw Script_wildoff dw Script_wildoff ; 38
dw Script_xycompare dw Script_xycompare ; 39
dw Script_warpmod dw Script_warpmod ; 3a
dw Script_blackoutmod dw Script_blackoutmod ; 3b
dw Script_warp dw Script_warp ; 3c
dw Script_readmoney dw Script_readmoney ; 3d
dw Script_readcoins dw Script_readcoins ; 3e
dw Script_RAM2MEM dw Script_RAM2MEM ; 3f
dw Script_pokenamemem dw Script_pokenamemem ; 40
dw Script_itemtotext dw Script_itemtotext ; 41
dw Script_mapnametotext dw Script_mapnametotext ; 42
dw Script_trainertotext dw Script_trainertotext ; 43
dw Script_stringtotext dw Script_stringtotext ; 44
dw Script_itemnotify dw Script_itemnotify ; 45
dw Script_pocketisfull dw Script_pocketisfull ; 46
dw Script_loadfont dw Script_loadfont ; 47
dw Script_refreshscreen dw Script_refreshscreen ; 48
dw Script_closetext dw Script_closetext ; 49
dw Script_loadbytec2cf dw Script_loadbytec2cf ; 4a
dw Script_farwritetext dw Script_farwritetext ; 4b
dw Script_writetext dw Script_writetext ; 4c
dw Script_repeattext dw Script_repeattext ; 4d
dw Script_yesorno dw Script_yesorno ; 4e
dw Script_loadmenudata dw Script_loadmenudata ; 4f
dw Script_writebackup dw Script_writebackup ; 50
dw Script_jumptextfaceplayer dw Script_jumptextfaceplayer ; 51
IF _CRYSTAL IF _CRYSTAL
dw Script_farjumptext dw Script_farjumptext ; 52
ENDC ENDC
dw Script_jumptext dw Script_jumptext ; 53
dw Script_waitbutton dw Script_waitbutton ; 54
dw Script_buttonsound dw Script_buttonsound ; 55
dw Script_pokepic dw Script_pokepic ; 56
dw Script_closepokepic dw Script_closepokepic ; 57
dw Script_interpretmenu dw Script_interpretmenu ; 58
dw Script_interpretmenu2 dw Script_interpretmenu2 ; 59
dw Script_loadpikachudata dw Script_loadpikachudata ; 5a
dw Script_randomwildmon dw Script_randomwildmon ; 5b
dw Script_loadmemtrainer dw Script_loadmemtrainer ; 5c
dw Script_loadwildmon dw Script_loadwildmon ; 5d
dw Script_loadtrainer dw Script_loadtrainer ; 5e
dw Script_startbattle dw Script_startbattle ; 5f
dw Script_returnafterbattle dw Script_returnafterbattle ; 60
dw Script_catchtutorial dw Script_catchtutorial ; 61
dw Script_trainertext dw Script_trainertext ; 62
dw Script_trainerflagaction dw Script_trainerflagaction ; 63
dw Script_winlosstext dw Script_winlosstext ; 64
dw Script_scripttalkafter dw Script_scripttalkafter ; 65
dw Script_end_if_just_battled dw Script_end_if_just_battled ; 66
dw Script_check_just_battled dw Script_check_just_battled ; 67
dw Script_setlasttalked dw Script_setlasttalked ; 68
dw Script_applymovement dw Script_applymovement ; 69
dw Script_applymovement2 dw Script_applymovement2 ; 6a
dw Script_faceplayer dw Script_faceplayer ; 6b
dw Script_faceperson dw Script_faceperson ; 6c
dw Script_variablesprite dw Script_variablesprite ; 6d
dw Script_disappear dw Script_disappear ; 6e
dw Script_appear dw Script_appear ; 6f
dw Script_follow dw Script_follow ; 70
dw Script_stopfollow dw Script_stopfollow ; 71
dw Script_moveperson dw Script_moveperson ; 72
dw Script_writepersonxy dw Script_writepersonxy ; 73
dw Script_loademote dw Script_loademote ; 74
dw Script_showemote dw Script_showemote ; 75
dw Script_spriteface dw Script_spriteface ; 76
dw Script_follownotexact dw Script_follownotexact ; 77
dw Script_earthquake dw Script_earthquake ; 78
dw Script_changemap dw Script_changemap ; 79
dw Script_changeblock dw Script_changeblock ; 7a
dw Script_reloadmap dw Script_reloadmap ; 7b
dw Script_reloadmappart dw Script_reloadmappart ; 7c
dw Script_writecmdqueue dw Script_writecmdqueue ; 7d
dw Script_delcmdqueue dw Script_delcmdqueue ; 7e
dw Script_playmusic dw Script_playmusic ; 7f
dw Script_encountermusic dw Script_encountermusic ; 80
dw Script_musicfadeout dw Script_musicfadeout ; 81
dw Script_playmapmusic dw Script_playmapmusic ; 82
dw Script_reloadmapmusic dw Script_reloadmapmusic ; 83
dw Script_cry dw Script_cry ; 84
dw Script_playsound dw Script_playsound ; 85
dw Script_waitsfx dw Script_waitsfx ; 86
dw Script_warpsound dw Script_warpsound ; 87
dw Script_specialsound dw Script_specialsound ; 88
dw Script_passtoengine dw Script_passtoengine ; 89
dw Script_newloadmap dw Script_newloadmap ; 8a
dw Script_pause dw Script_pause ; 8b
dw Script_deactivatefacing dw Script_deactivatefacing ; 8c
dw Script_priorityjump dw Script_priorityjump ; 8d
dw Script_warpcheck dw Script_warpcheck ; 8e
dw Script_ptpriorityjump dw Script_ptpriorityjump ; 8f
dw Script_return dw Script_return ; 90
dw Script_end dw Script_end ; 91
dw Script_reloadandreturn dw Script_reloadandreturn ; 92
dw Script_resetfuncs dw Script_end_all ; 93
dw Script_pokemart dw Script_pokemart ; 94
dw Script_elevator dw Script_elevator ; 95
dw Script_trade dw Script_trade ; 96
dw Script_askforphonenumber dw Script_askforphonenumber ; 97
dw Script_phonecall dw Script_phonecall ; 98
dw Script_hangup dw Script_hangup ; 99
dw Script_describedecoration dw Script_describedecoration ; 9a
dw Script_fruittree dw Script_fruittree ; 9b
dw Script_specialphonecall dw Script_specialphonecall ; 9c
dw Script_checkphonecall dw Script_checkphonecall ; 9d
dw Script_verbosegiveitem dw Script_verbosegiveitem ; 9e
dw Script_verbosegiveitem2 dw Script_verbosegiveitem2 ; 9f
dw Script_loadwilddata dw Script_swarm ; a0
dw Script_halloffame dw Script_halloffame ; a1
dw Script_credits dw Script_credits ; a2
dw Script_warpfacing dw Script_warpfacing ; a3
dw Script_battletowertext dw Script_battletowertext ; a4
dw Script_displaylocation dw Script_landmarktotext ; a5
dw Script_trainerclassname dw Script_trainerclassname ; a6
dw Script_name dw Script_name ; a7
dw Script_wait dw Script_wait ; a8
dw Script_check_save dw Script_check_save ; a9
; 96e05 ; 96e05
StartScript: ; 96e05 StartScript: ; 96e05
@@ -836,7 +836,7 @@ Script_fruittree: ; 970ee
jp ScriptJump jp ScriptJump
; 970fc ; 970fc
Script_loadwilddata: ; 970fc Script_swarm: ; 970fc
; script command 0xa0 ; script command 0xa0
; parameters: ; parameters:
; flag (SingleByteParam) ; flag (SingleByteParam)
@@ -849,7 +849,7 @@ Script_loadwilddata: ; 970fc
ld d, a ld d, a
call GetScriptByte call GetScriptByte
ld e, a ld e, a
callba LoadWildData callba StoreSwarmMapIndices
ret ret
; 9710f ; 9710f
@@ -2186,7 +2186,7 @@ ConvertLandmarkToText: ; 976f4
jp ConvertMemToText jp ConvertMemToText
; 97701 ; 97701
Script_displaylocation: ; 97701 Script_landmarktotext: ; 97701
; script command 0xa5 ; script command 0xa5
; parameters: ; parameters:
; id (SingleByteParam) ; id (SingleByteParam)
@@ -3187,7 +3187,7 @@ endr
ret ret
; 97bc0 ; 97bc0
Script_resetfuncs: ; 97bc0 Script_end_all: ; 97bc0
; script command 0x93 ; script command 0x93
xor a xor a
@@ -3219,7 +3219,7 @@ Script_credits: ; 97bf3
callba RedCredits callba RedCredits
DisplayCredits: DisplayCredits:
call Script_resetfuncs call Script_end_all
ld a, $3 ld a, $3
call LoadMapStatus call LoadMapStatus
call StopScript call StopScript

14
engine/specials.asm
View File

@@ -498,22 +498,22 @@ Special_ActivateFishingSwarm: ; c3fc
; c403 ; c403
LoadWildData:: ; c403 StoreSwarmMapIndices:: ; c403
ld a, c ld a, c
and a and a
jr nz, .swarm_route35 jr nz, .yanma
; swarm dark cave violet entrance ; swarm dark cave violet entrance
ld a, d ld a, d
ld [wdfcc], a ld [wDunsparceMapGroup], a
ld a, e ld a, e
ld [wdfcd], a ld [wDunsparceMapNumber], a
ret ret
.swarm_route35 .yanma
ld a, d ld a, d
ld [wdc5a], a ld [wYanmaMapGroup], a
ld a, e ld a, e
ld [wdc5b], a ld [wYanmaMapNumber], a
ret ret
; c419 ; c419

2
engine/startmenu.asm
View File

@@ -146,7 +146,7 @@ endr
call MenuFunc_1e7f call MenuFunc_1e7f
call .DrawBugContestStatus call .DrawBugContestStatus
call UpdateSprites call UpdateSprites
call Functiond90 call ret_d90
call Function2b5c call Function2b5c
ret ret
; 126d3 ; 126d3

2
engine/town_map.asm
View File

@@ -47,7 +47,7 @@ _TownMap: ; 9191c
and a and a
jr z, .sgb jr z, .sgb
ld a, $e4 ld a, $e4
call Functioncf8 call DmgToCgbObjPal0
call DelayFrame call DelayFrame
.sgb .sgb

6
engine/trade/animation.asm
View File

@@ -371,7 +371,7 @@ Function2914e: ; 2914e
ld a, $e4 ld a, $e4
call DmgToCgbBGPals call DmgToCgbBGPals
ld a, $d0 ld a, $d0
call Functioncf8 call DmgToCgbObjPal0
call NextTradeAnim call NextTradeAnim
ld a, $5c ld a, $5c
ld [wcf64], a ld [wcf64], a
@@ -1088,7 +1088,7 @@ TradeAnim_Poof: ; 29649
TradeAnim_BulgeThroughTube: ; 29660 TradeAnim_BulgeThroughTube: ; 29660
ld a, $e4 ld a, $e4
call Functioncf8 call DmgToCgbObjPal0
depixel 5, 11 depixel 5, 11
ld a, SPRITE_ANIM_INDEX_10 ld a, SPRITE_ANIM_INDEX_10
call _InitSpriteAnimStruct call _InitSpriteAnimStruct
@@ -1379,7 +1379,7 @@ Function297ed: ; 297ed
ld a, $f0 ld a, $f0
.asm_297f6 .asm_297f6
call Functioncf8 call DmgToCgbObjPal0
ld a, $e4 ld a, $e4
call DmgToCgbBGPals call DmgToCgbBGPals
ret ret

126
engine/wildmons.asm
View File

@@ -1,30 +1,34 @@
LoadWildMonData: ; 29ff8 LoadWildMonData: ; 29ff8
call _GrassWildmonLookup call _GrassWildmonLookup
jr c, .copy jr c, .copy
ld hl, wd25a ld hl, wMornEncounterRate
xor a xor a
ld [hli], a ld [hli], a
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
jr .done_copy jr .done_copy
.copy .copy
inc hl inc hl
inc hl inc hl
ld de, wd25a ld de, wMornEncounterRate
ld bc, $3 ld bc, 3
call CopyBytes call CopyBytes
.done_copy .done_copy
call _WaterWildmonLookup call _WaterWildmonLookup
ld a, $0 ld a, 0
jr nc, .no_copy jr nc, .no_copy
inc hl inc hl
inc hl inc hl
ld a, [hl] ld a, [hl]
.no_copy .no_copy
ld [wd25d], a ld [wWaterEncounterRate], a
ret ret
Function2a01f: ; 2a01f FindNest: ; 2a01f
; Parameters:
; e: 0 = Johto, 1 = Kanto
; wNamedObjectIndexBuffer: species
hlcoord 0, 0 hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
xor a xor a
@@ -34,25 +38,24 @@ Function2a01f: ; 2a01f
jr nz, .kanto jr nz, .kanto
decoord 0, 0 decoord 0, 0
ld hl, JohtoGrassWildMons ld hl, JohtoGrassWildMons
call Function2a052 call .FindGrass
ld hl, JohtoWaterWildMons ld hl, JohtoWaterWildMons
call Function2a06e call .FindWater
call Function2a0b7 call .RoamMon1
call Function2a0cf call .RoamMon2
ret ret
.kanto .kanto
decoord 0, 0 decoord 0, 0
ld hl, KantoGrassWildMons ld hl, KantoGrassWildMons
call Function2a052 call .FindGrass
ld hl, KantoWaterWildMons ld hl, KantoWaterWildMons
jp Function2a06e jp .FindWater
; 2a052 ; 2a052
Function2a052: ; 2a052 .FindGrass: ; 2a052
.loop
ld a, [hl] ld a, [hl]
cp $ff cp -1
ret z ret z
push hl push hl
ld a, [hli] ld a, [hli]
@@ -62,23 +65,22 @@ Function2a052: ; 2a052
rept 3 rept 3
inc hl inc hl
endr endr
ld a, $15 ld a, NUM_WILDMONS_PER_AREA_TIME_OF_DAY * 3
call Function2a088 call .SearchMapForMon
jr nc, .next jr nc, .next_grass
ld [de], a ld [de], a
inc de inc de
.next .next_grass
pop hl pop hl
ld bc, $2f ld bc, WILDMON_GRASS_STRUCTURE_LENGTH
add hl, bc add hl, bc
jr .loop jr .FindGrass
; 2a06e ; 2a06e
Function2a06e: ; 2a06e .FindWater: ; 2a06e
.loop
ld a, [hl] ld a, [hl]
cp $ff cp -1
ret z ret z
push hl push hl
ld a, [hli] ld a, [hli]
@@ -86,24 +88,24 @@ Function2a06e: ; 2a06e
ld a, [hli] ld a, [hli]
ld c, a ld c, a
inc hl inc hl
ld a, $3 ld a, 3
call Function2a088 call .SearchMapForMon
jr nc, .next jr nc, .next_water
ld [de], a ld [de], a
inc de inc de
.next .next_water
pop hl pop hl
ld bc, 9 ld bc, 3 * 3
add hl, bc add hl, bc
jr .loop jr .FindWater
; 2a088 ; 2a088
Function2a088: ; 2a088 .SearchMapForMon: ; 2a088
inc hl inc hl
.loop .ScanMapLoop
push af push af
ld a, [wd265] ld a, [wNamedObjectIndexBuffer]
cp [hl] cp [hl]
jr z, .found jr z, .found
rept 2 rept 2
@@ -111,68 +113,68 @@ rept 2
endr endr
pop af pop af
dec a dec a
jr nz, .loop jr nz, .ScanMapLoop
and a and a
ret ret
.found .found
pop af pop af
jp Function2a09c jp .AppendNest
; 2a09c ; 2a09c
Function2a09c: ; 2a09c .AppendNest: ; 2a09c
push de push de
call GetWorldMapLocation call GetWorldMapLocation
ld c, a ld c, a
hlcoord 0, 0 hlcoord 0, 0
ld de, SCREEN_WIDTH * SCREEN_HEIGHT ld de, SCREEN_WIDTH * SCREEN_HEIGHT
.loop .AppendNestLoop
ld a, [hli] ld a, [hli]
cp c cp c
jr z, .found jr z, .found_nest
dec de dec de
ld a, e ld a, e
or d or d
jr nz, .loop jr nz, .AppendNestLoop
ld a, c ld a, c
pop de pop de
scf scf
ret ret
.found .found_nest
pop de pop de
and a and a
ret ret
; 2a0b7 ; 2a0b7
Function2a0b7: ; 2a0b7 .RoamMon1: ; 2a0b7
ld a, [wRoamMon1Species] ld a, [wRoamMon1Species]
ld b, a ld b, a
ld a, [wd265] ld a, [wNamedObjectIndexBuffer]
cp b cp b
ret nz ret nz
ld a, [wRoamMon1MapGroup] ld a, [wRoamMon1MapGroup]
ld b, a ld b, a
ld a, [wRoamMon1MapNumber] ld a, [wRoamMon1MapNumber]
ld c, a ld c, a
call Function2a09c call .AppendNest
ret nc ret nc
ld [de], a ld [de], a
inc de inc de
ret ret
; 2a0cf ; 2a0cf
Function2a0cf: ; 2a0cf .RoamMon2: ; 2a0cf
ld a, [wRoamMon2Species] ld a, [wRoamMon2Species]
ld b, a ld b, a
ld a, [wd265] ld a, [wNamedObjectIndexBuffer]
cp b cp b
ret nz ret nz
ld a, [wRoamMon2MapGroup] ld a, [wRoamMon2MapGroup]
ld b, a ld b, a
ld a, [wRoamMon2MapNumber] ld a, [wRoamMon2MapNumber]
ld c, a ld c, a
call Function2a09c call .AppendNest
ret nc ret nc
ld [de], a ld [de], a
inc de inc de
@@ -209,7 +211,7 @@ TryWildEncounter:: ; 2a0e7
; 2a111 ; 2a111
GetMapEncounterRate: ; 2a111 GetMapEncounterRate: ; 2a111
ld hl, wd25a ld hl, wMornEncounterRate
call CheckOnWater call CheckOnWater
ld a, 3 ld a, 3
jr z, .ok jr z, .ok
@@ -446,10 +448,10 @@ _SwarmWildmonCheck
bit 2, [hl] bit 2, [hl]
pop hl pop hl
jr z, .CheckYanma jr z, .CheckYanma
ld a, [wdfcc] ld a, [wDunsparceMapGroup]
cp d cp d
jr nz, .CheckYanma jr nz, .CheckYanma
ld a, [wdfcd] ld a, [wDunsparceMapNumber]
cp e cp e
jr nz, .CheckYanma jr nz, .CheckYanma
call LookUpWildmonsForMapDE call LookUpWildmonsForMapDE
@@ -463,10 +465,10 @@ _SwarmWildmonCheck
bit 3, [hl] bit 3, [hl]
pop hl pop hl
jr z, _NoSwarmWildmon jr z, _NoSwarmWildmon
ld a, [wdc5a] ld a, [wYanmaMapGroup]
cp d cp d
jr nz, _NoSwarmWildmon jr nz, _NoSwarmWildmon
ld a, [wdc5b] ld a, [wYanmaMapNumber]
cp e cp e
jr nz, _NoSwarmWildmon jr nz, _NoSwarmWildmon
call LookUpWildmonsForMapDE call LookUpWildmonsForMapDE
@@ -702,11 +704,11 @@ UpdateRoamMons: ; 2a30d
rept 2 rept 2
add hl, bc add hl, bc
endr endr
ld a, [wdfe7] ld a, [wRoamMons_LastMapGroup]
cp [hl] cp [hl]
jr nz, .done jr nz, .done
inc hl inc hl
ld a, [wdfe6] ld a, [wRoamMons_LastMapNumber]
cp [hl] cp [hl]
jr z, .update_loop jr z, .update_loop
dec hl dec hl
@@ -787,14 +789,14 @@ JumpRoamMon: ; 2a3cd
; 2a3f6 ; 2a3f6
_BackUpMapIndices: ; 2a3f6 _BackUpMapIndices: ; 2a3f6
ld a, [wdfe4] ld a, [wRoamMons_CurrentMapNumber]
ld [wdfe6], a ld [wRoamMons_LastMapNumber], a
ld a, [wdfe5] ld a, [wRoamMons_CurrentMapGroup]
ld [wdfe7], a ld [wRoamMons_LastMapGroup], a
ld a, [MapNumber] ld a, [MapNumber]
ld [wdfe4], a ld [wRoamMons_CurrentMapNumber], a
ld a, [MapGroup] ld a, [MapGroup]
ld [wdfe5], a ld [wRoamMons_CurrentMapGroup], a
ret ret
; 2a40f ; 2a40f
@@ -892,7 +894,7 @@ endr
ld de, StringBuffer1 ld de, StringBuffer1
call CopyName1 call CopyName1
ld a, c ld a, c
ld [wd265], a ld [wNamedObjectIndexBuffer], a
call GetPokemonName call GetPokemonName
ld hl, UnknownText_0x2a51a ld hl, UnknownText_0x2a51a
call PrintText call PrintText
@@ -945,7 +947,7 @@ rept 2
endr endr
inc hl inc hl
ld a, [hl] ld a, [hl]
ld [wd265], a ld [wNamedObjectIndexBuffer], a
call GetPokemonName call GetPokemonName
ld hl, StringBuffer1 ld hl, StringBuffer1
ld de, StringBuffer4 ld de, StringBuffer4
@@ -1029,7 +1031,7 @@ endr
inc hl ; species inc hl ; species
ld a, BANK(Trainers) ld a, BANK(Trainers)
call GetFarByte call GetFarByte
ld [wd265], a ld [wNamedObjectIndexBuffer], a
call GetPokemonName call GetPokemonName
ld hl, StringBuffer1 ld hl, StringBuffer1
ld de, StringBuffer4 ld de, StringBuffer4

2
event/whiteout.asm
View File

@@ -20,7 +20,7 @@ Script_Whiteout: ; 0x124ce
farscall Script_AbortBugContest farscall Script_AbortBugContest
special WarpToSpawnPoint special WarpToSpawnPoint
newloadmap MAPSETUP_WARP newloadmap MAPSETUP_WARP
resetfuncs end_all
.bug_contest .bug_contest
jumpstd bugcontestresultswarp jumpstd bugcontestresultswarp

0
gfx/unknown/0922d1.2bpp → gfx/pokegear/dexmap_nest_icon.2bpp
View File

BIN
gfx/pokegear/flymap_label_border.2bpp Normal file
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More