diff options
| -rw-r--r-- | constants.asm | 2 | ||||
| -rw-r--r-- | constants/misc_constants.asm | 2 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 10 | ||||
| -rwxr-xr-x | data/wildPokemon/mtmoonb1.asm | 10 | ||||
| -rwxr-xr-x | data/wildPokemon/pokemontower5.asm | 2 | ||||
| -rwxr-xr-x | data/wildPokemon/pokemontower7.asm | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | data/wildPokemon/route19.asm (renamed from data/wildPokemon/waterpokemon.asm) | 2 | ||||
| -rw-r--r-- | data/wildPokemon/route20.asm | 15 | ||||
| -rwxr-xr-x | data/wild_mons.asm | 9 | ||||
| -rwxr-xr-x | wram.asm | 12 | ||||
| -rwxr-xr-x | yellow/main.asm | 65 |
11 files changed, 88 insertions, 43 deletions
diff --git a/constants.asm b/constants.asm index 7fa691b5..42ecea27 100644 --- a/constants.asm +++ b/constants.asm @@ -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" diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index b42745cc..1c3e07ad 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -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 diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm deleted file mode 100644 index 067c8707..00000000 --- a/constants/wram_constants.asm +++ /dev/null @@ -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 - diff --git a/data/wildPokemon/mtmoonb1.asm b/data/wildPokemon/mtmoonb1.asm index fd75f72b..61c0b05c 100755 --- a/data/wildPokemon/mtmoonb1.asm +++ b/data/wildPokemon/mtmoonb1.asm @@ -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 diff --git a/data/wildPokemon/pokemontower5.asm b/data/wildPokemon/pokemontower5.asm index b6c34941..55fe2e27 100755 --- a/data/wildPokemon/pokemontower5.asm +++ b/data/wildPokemon/pokemontower5.asm @@ -1,5 +1,5 @@ TowerMons5: - db $0A + db $0F db 22,GASTLY db 23,GASTLY db 24,GASTLY diff --git a/data/wildPokemon/pokemontower7.asm b/data/wildPokemon/pokemontower7.asm index 9b99d518..34ca6225 100755 --- a/data/wildPokemon/pokemontower7.asm +++ b/data/wildPokemon/pokemontower7.asm @@ -1,5 +1,5 @@ TowerMons7: - db $0F + db $14 db 24,GASTLY db 25,GASTLY db 26,GASTLY diff --git a/data/wildPokemon/waterpokemon.asm b/data/wildPokemon/route19.asm index ef2d39ea..77e1e3ef 100755..100644 --- a/data/wildPokemon/waterpokemon.asm +++ b/data/wildPokemon/route19.asm @@ -1,4 +1,4 @@ -WaterMons: +Route19Mons: db $00 db $05 diff --git a/data/wildPokemon/route20.asm b/data/wildPokemon/route20.asm new file mode 100644 index 00000000..b955c330 --- /dev/null +++ b/data/wildPokemon/route20.asm @@ -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 + diff --git a/data/wild_mons.asm b/data/wild_mons.asm index e1c81b8b..15cbccc7 100755 --- a/data/wild_mons.asm +++ b/data/wild_mons.asm @@ -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" @@ -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 diff --git a/yellow/main.asm b/yellow/main.asm index a7dc5827..86471d2d 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -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] |