Leahnaya/pokeyellow
1
0
Fork 0
mirror of https://github.com/pret/pokeyellow.git synced 2026-10-02 06:09:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

More bank3 documentation

Browse Source 
LoadWildData, data/wild_mons.asm, also no more wram_constants.asm and
complete bank1b documentation
This commit is contained in:
luckytyphlosion
2015-10-10 16:54:00 -04:00
parent 3db446ca4f
commit 5c181f2d68
11 changed files with 88 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
constants.asm
View File

@@ -7,8 +7,6 @@ INCLUDE "constants/hardware_constants.asm"
INCLUDE "constants/oam_constants.asm"
INCLUDE "constants/misc_constants.asm"
INCLUDE "constants/wram_constants.asm"
INCLUDE "constants/pokemon_constants.asm"
INCLUDE "constants/pokedex_constants.asm"
INCLUDE "constants/trainer_constants.asm"

2
constants/misc_constants.asm
View File

@@ -35,6 +35,8 @@ SCREEN_HEIGHT_PIXELS EQU SCREEN_HEIGHT * 8
BG_MAP_WIDTH EQU 32
BG_MAP_HEIGHT EQU 32
SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile)
NPC_MOVEMENT_DOWN EQU $00
NPC_MOVEMENT_UP EQU $40
NPC_MOVEMENT_LEFT EQU $80

10
constants/wram_constants.asm
View File

@@ -1,10 +0,0 @@
SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile)
; Overload W_GRASSMONS
wSerialEnemyDataBlock EQU $d893 ; W_GRASSMONS + 11
; Overload enemy party data
W_WATERRATE EQU $d8a4 ; wEnemyMon1Species
W_WATERMONS EQU $d8a5 ; wEnemyMon1Species + 1

10
data/wildPokemon/mtmoonb1.asm
View File

@@ -2,13 +2,13 @@ MoonMonsB1:
db $0A
db 8,ZUBAT
db 9,ZUBAT
db 10,GEODUDE
db 6,ZUBAT
db 7,ZUBAT
db 10,ZUBAT
db 10,GEODUDE
db 11,GEODUDE
db 11,ZUBAT
db 12,SANDSHREW
db 11,CLEFAIRY
db 9,PARAS
db 11,PARAS
db 10,CLEFAIRY
db 12,CLEFAIRY
db $00

2
data/wildPokemon/pokemontower5.asm
View File

@@ -1,5 +1,5 @@
TowerMons5:
db $0A
db $0F
db 22,GASTLY
db 23,GASTLY
db 24,GASTLY

2
data/wildPokemon/pokemontower7.asm
View File

@@ -1,5 +1,5 @@
TowerMons7:
db $0F
db $14
db 24,GASTLY
db 25,GASTLY
db 26,GASTLY

2
data/wildPokemon/waterpokemon.asm → data/wildPokemon/route19.asm Executable file → Normal file
View File

@@ -1,4 +1,4 @@
WaterMons:
Route19Mons:
db $00
db $05

15
data/wildPokemon/route20.asm Normal file
View File

@@ -0,0 +1,15 @@
Route20Mons:
db $00
db $05
db 5,TENTACOOL
db 10,TENTACOOL
db 15,TENTACOOL
db 5,TENTACOOL
db 10,TENTACOOL
db 15,TENTACOOL
db 20,TENTACOOL
db 30,TENTACOOL
db 35,TENTACOOL
db 40,TENTACOOL

9
data/wild_mons.asm
View File

@@ -1,4 +1,4 @@
WildDataPointers: ; ceeb (3:4eeb)
WildDataPointers: ; cb95 (3:4b95)
dw NoMons ; PALLET_TOWN
dw NoMons ; VIRIDIAN_CITY
dw NoMons ; PEWTER_CITY
@@ -29,8 +29,8 @@ WildDataPointers: ; ceeb (3:4eeb)
dw Route16Mons ; ROUTE_16
dw Route17Mons ; ROUTE_17
dw Route18Mons ; ROUTE_18
dw WaterMons ; ROUTE_19
dw WaterMons ; ROUTE_20
dw Route19Mons ; ROUTE_19
dw Route20Mons ; ROUTE_20
dw Route21Mons ; ROUTE_21
dw Route22Mons ; ROUTE_22
dw Route23Mons ; ROUTE_23
@@ -300,7 +300,8 @@ INCLUDE "data/wildPokemon/safarizonecenter.asm"
INCLUDE "data/wildPokemon/safarizone1.asm"
INCLUDE "data/wildPokemon/safarizone2.asm"
INCLUDE "data/wildPokemon/safarizone3.asm"
INCLUDE "data/wildPokemon/waterpokemon.asm"
INCLUDE "data/wildPokemon/route19.asm"
INCLUDE "data/wildPokemon/route20.asm"
INCLUDE "data/wildPokemon/seafoamisland1.asm"
INCLUDE "data/wildPokemon/seafoamislandb1.asm"
INCLUDE "data/wildPokemon/seafoamislandb2.asm"

12
wram.asm
View File

@@ -3202,11 +3202,21 @@ W_GRASSRATE:: ; d887
ds 1
W_GRASSMONS:: ; d888
ds 20
; ds 20
ds 11
; Overload wGrassMons
wSerialEnemyDataBlock:: ; d893
ds 9
wEnemyPartyCount:: ds 1 ; d89c
wEnemyPartyMons:: ds PARTY_LENGTH + 1 ; d89d
W_WATERRATE:: db ; d8a4
W_WATERMONS:: db ; d8a5
ds W_WATERRATE - @
wEnemyMons:: ; d8a4
wEnemyMon1:: party_struct wEnemyMon1
wEnemyMon2:: party_struct wEnemyMon2

65
yellow/main.asm
View File

@@ -791,7 +791,39 @@ IncrementDayCareMonExp: ; c684 (3:4684)
INCLUDE "data/hide_show_data.asm"
LoadWildData: ; cb62 (3:4b62)
dr $cb62,$d2ed
ld hl,WildDataPointers
ld a,[W_CURMAP]
; get wild data for current map
ld c,a
ld b,0
add hl,bc
add hl,bc
ld a,[hli]
ld h,[hl]
ld l,a ; hl now points to wild data for current map
ld a,[hli]
ld [W_GRASSRATE],a
and a
jr z,.NoGrassData ; if no grass data, skip to surfing data
push hl
ld de,W_GRASSMONS ; otherwise, load grass data
ld bc,$0014
call CopyData
pop hl
ld bc,$0014
add hl,bc
.NoGrassData
ld a,[hli]
ld [W_WATERRATE],a
and a
ret z ; if no water data, we're done
ld de,W_WATERMONS ; otherwise, load surfing data
ld bc,$0014
jp CopyData
INCLUDE "data/wild_mons.asm"
UseItem_: ; d2ed (3:52ed)
dr $d2ed,$e635
TossItem_: ; e635 (3:6635)
@@ -995,21 +1027,6 @@ PrintSafariGameOverText: ; 1e385 (7:6385)
CinnabarGymQuiz_1eb0a: ; 1e4bf (7:64bf)
dr $1e4bf,$20000
;SECTION "bank08",ROMX,BANK[$08]
; dr $20000,$218bb
;Music_DoLowHealthAlarm: ; 2131e (8:531e)
; dr $2131e,$2146f
;BillsPC_: ; 2146f (8:546f)
;Func_218bb: ; 218bb (8:58bb)
; dr $218bb,$219f8
;Func_219f8: ; 219f8 (8:59f8)
; dr $219f8,$21ab7
;Func_21ab7: ; 21ab7 (8:5ab7)
; dr $21ab7,$21b3f
;Func_21b3f: ; 21b3f (8:5b3f)
; dr $21b3f,$24000
SECTION "Pics 1", ROMX, BANK[PICS_1]
RhydonPicFront: INCBIN "pic/ymon/rhydon.pic"
@@ -1535,8 +1552,20 @@ SECTION "bank1A",ROMX,BANK[$1A]
SECTION "bank1B",ROMX,BANK[$1B]
dr $6c000,$70000
Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.t4.2bpp"
Cemetery_Block: INCBIN "gfx/blocksets/cemetery.bst"
Cavern_GFX: INCBIN "gfx/tilesets/cavern.t14.2bpp"
Cavern_Block: INCBIN "gfx/blocksets/cavern.bst"
Lobby_GFX: INCBIN "gfx/tilesets/lobby.t2.2bpp"
Lobby_Block: INCBIN "gfx/blocksets/lobby.bst"
Ship_GFX: INCBIN "gfx/tilesets/ship.t6.2bpp"
Ship_Block: INCBIN "gfx/blocksets/ship.bst"
Lab_GFX: INCBIN "gfx/tilesets/lab.t4.2bpp"
Lab_Block: INCBIN "gfx/blocksets/lab.bst"
Club_GFX: INCBIN "gfx/tilesets/club.t5.2bpp"
Club_Block: INCBIN "gfx/blocksets/club.bst"
Underground_GFX: INCBIN "gfx/tilesets/underground.t7.2bpp"
Underground_Block: INCBIN "gfx/blocksets/underground.bst"
SECTION "bank1C",ROMX,BANK[$1C]