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

Merge pull request #568 from mid-kid/master

Browse Source 
ゴロゴロ
This commit is contained in:
Rangi 2018-10-21 00:36:06 -04:00 committed by GitHub
commit 12666e3c70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -18,6 +18,8 @@
*.sav
*.rtc
*.sn*
*.sa*
*.sg1
# rgbds extras
*.map
@ -44,4 +46,4 @@ pokecrystal.txt
gfx/pokemon/*/bitmask.asm
gfx/pokemon/*/frames.asm
!gfx/pokemon/unown/bitmask.asm
!gfx/pokemon/unown/frames.asm
!gfx/pokemon/unown/frames.asm

6
engine/overworld/events.asm
View File

@ -248,7 +248,7 @@ PlayerEvents:
call Dummy_CheckScriptFlags3Bit5 ; This is a waste of time
call CheckTrainerBattle3
call CheckTrainerBattle_GetPlayerEvent
jr c, .ok
call CheckTileEvent
@ -289,10 +289,10 @@ PlayerEvents:
scf
ret
CheckTrainerBattle3:
CheckTrainerBattle_GetPlayerEvent:
nop
nop
call CheckTrainerBattle2
call CheckTrainerBattle
jr nc, .nope
ld a, PLAYEREVENT_SEENBYTRAINER

2
home/flag.asm
View File

@ -38,7 +38,7 @@ FlagAction::
; 1 SET_FLAG set bit
; 2 CHECK_FLAG check bit
; de: bit number
; hl: index within bit table
; hl: pointer to the flag array
; get index within the byte
ld a, e

8
home/trainers.asm
View File

@ -1,16 +1,16 @@
CheckTrainerBattle2::
CheckTrainerBattle::
ldh a, [hROMBank]
push af
call SwitchToMapScriptsBank
call CheckTrainerBattle
call _CheckTrainerBattle
pop bc
ld a, b
rst Bankswitch
ret
CheckTrainerBattle::
_CheckTrainerBattle::
; Check if any trainer on the map sees the player and wants to battle.
; Skip the player object.
@ -35,7 +35,7 @@ CheckTrainerBattle::
add hl, de
ld a, [hl]
and $f
cp $2
cp OBJECTTYPE_TRAINER
jr nz, .next
; Is visible on the map

4
hram.asm
View File

@ -126,9 +126,7 @@ hWY:: db ; ffd2
hTilesPerCycle:: db ; ffd3
hBGMapMode:: db ; ffd4
hBGMapThird:: db ; ffd5
hBGMapAddress:: db ; ffd6
ds 1
hBGMapAddress:: dw ; ffd6
hOAMUpdate:: db ; ffd8

30
macros/scripts/movement.asm
View File

@ -1,5 +1,5 @@
; MovementPointers indexes (see engine/overworld/movement.asm)
enum_start
enum_start 0, +4
; Directional movements
@ -8,98 +8,72 @@ turn_head: MACRO
db movement_turn_head | \1
ENDM
__enum__ = __enum__ + 3
enum movement_turn_step ; $04
turn_step: MACRO
db movement_turn_step | \1
ENDM
__enum__ = __enum__ + 3
enum movement_slow_step ; $08
slow_step: MACRO
db movement_slow_step | \1
ENDM
__enum__ = __enum__ + 3
enum movement_step ; $0c
step: MACRO
db movement_step | \1
ENDM
__enum__ = __enum__ + 3
enum movement_big_step ; $10
big_step: MACRO
db movement_big_step | \1
ENDM
__enum__ = __enum__ + 3
enum movement_slow_slide_step ; $14
slow_slide_step: MACRO
db movement_slow_slide_step | \1
ENDM
__enum__ = __enum__ + 3
enum movement_slide_step ; $18
slide_step: MACRO
db movement_slide_step | \1
ENDM
__enum__ = __enum__ + 3
enum movement_fast_slide_step ; $1c
fast_slide_step: MACRO
db movement_fast_slide_step | \1
ENDM
__enum__ = __enum__ + 3
enum movement_turn_away ; $20
turn_away: MACRO
db movement_turn_away | \1
ENDM
__enum__ = __enum__ + 3
enum movement_turn_in ; $24
turn_in: MACRO
db movement_turn_in | \1
ENDM
__enum__ = __enum__ + 3
enum movement_turn_waterfall ; $28
turn_waterfall: MACRO
db movement_turn_waterfall | \1
ENDM
__enum__ = __enum__ + 3
enum movement_slow_jump_step ; $2c
slow_jump_step: MACRO
db movement_slow_jump_step | \1
ENDM
__enum__ = __enum__ + 3
enum movement_jump_step ; $30
jump_step: MACRO
db movement_jump_step | \1
ENDM
__enum__ = __enum__ + 3
enum movement_fast_jump_step ; $34
fast_jump_step: MACRO
db movement_fast_jump_step | \1
ENDM
__enum__ = __enum__ + 3
__enumdir__ = +1
; Control
enum movement_remove_sliding ; $38