mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
version-sensitive objects for egg moves and evos/attacks
this way main.o and wram.o are version-neutral
This commit is contained in:
parent
02e8b4c7b6
commit
94188ee0f7
2
Makefile
2
Makefile
@ -6,7 +6,7 @@ PYTHON := python
|
||||
TEXTFILES := $(shell find ./ -type f -name '*.asm' | grep -v globals.asm)
|
||||
TEXTQUEUE :=
|
||||
|
||||
CRYSTAL_OBJS := wram.o main.o
|
||||
CRYSTAL_OBJS := wram.o main.o stats/egg_moves_crystal.o stats/evos_attacks_crystal.o
|
||||
OBJS := $(CRYSTAL_OBJS)
|
||||
|
||||
ROMS := pokecrystal.gbc
|
||||
|
@ -1,10 +1,3 @@
|
||||
_CRYSTAL EQU 1
|
||||
|
||||
if _CRYSTAL
|
||||
VERSION EQU 0
|
||||
else
|
||||
VERSION EQU 1
|
||||
endc
|
||||
|
||||
; wram constants
|
||||
; MonType: ; cf5f
|
||||
|
@ -2018,7 +2018,7 @@ Script_checkver: ; 0x976a6
|
||||
; 0x976ad
|
||||
|
||||
Version: ; 976ad
|
||||
db VERSION
|
||||
db 0 ; VERSION
|
||||
; 976ae
|
||||
|
||||
Script_pokenamemem: ; 0x976ae
|
||||
|
6
main.asm
6
main.asm
@ -31423,10 +31423,7 @@ INCBIN "baserom.gbc",$2017c,$20181 - $2017c
|
||||
|
||||
INCLUDE "tilesets/data_3.asm"
|
||||
|
||||
EggMovePointers: ; 0x23b11
|
||||
INCLUDE "stats/egg_move_pointers.asm"
|
||||
|
||||
INCLUDE "stats/egg_moves.asm"
|
||||
|
||||
|
||||
SECTION "bank9",ROMX,BANK[$9]
|
||||
@ -54674,10 +54671,7 @@ GetPreEvolution: ; 42581
|
||||
; 425b1
|
||||
|
||||
|
||||
EvosAttacksPointers: ; 0x425b1
|
||||
INCLUDE "stats/evos_attacks_pointers.asm"
|
||||
|
||||
INCLUDE "stats/evos_attacks.asm"
|
||||
|
||||
|
||||
SECTION "bank11",ROMX,BANK[$11]
|
||||
|
@ -1,3 +1,4 @@
|
||||
EggMovePointers: ; 0x23b11
|
||||
dw BulbasaurEggMoves
|
||||
dw NoEggMoves
|
||||
dw NoEggMoves
|
||||
|
6
stats/egg_moves_crystal.asm
Normal file
6
stats/egg_moves_crystal.asm
Normal file
@ -0,0 +1,6 @@
|
||||
INCLUDE "pokecrystal.asm"
|
||||
INCLUDE "includes.asm"
|
||||
|
||||
SECTION "eggmoves", ROMX, BANK[$8]
|
||||
INCLUDE "stats/egg_move_pointers.asm"
|
||||
INCLUDE "stats/egg_moves.asm"
|
6
stats/evos_attacks_crystal.asm
Normal file
6
stats/evos_attacks_crystal.asm
Normal file
@ -0,0 +1,6 @@
|
||||
INCLUDE "pokecrystal.asm"
|
||||
INCLUDE "includes.asm"
|
||||
|
||||
SECTION "evosattacks", ROMx, BANK[$10]
|
||||
INCLUDE "stats/evos_attacks_pointers.asm"
|
||||
INCLUDE "stats/evos_attacks.asm"
|
@ -2,6 +2,7 @@
|
||||
|
||||
; These are grouped together since they're both checked at level-up.
|
||||
|
||||
EvosAttacksPointers: ; 0x425b1
|
||||
dw BulbasaurEvosAttacks
|
||||
dw IvysaurEvosAttacks
|
||||
dw VenusaurEvosAttacks
|
||||
|
Loading…
Reference in New Issue
Block a user