thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

RGBDS syntax updates (#358)

Browse source 
New MACRO and DEF syntax
This commit is contained in:
vulcandth 2022-06-06 16:25:31 -05:00 • committed by GitHub
parent d7808d110f
commit 6b5be9129c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
101 changed files with 958 additions and 958 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engine/battle/animations.asm
View file

@ -372,7 +372,7 @@ LoadAnimationTileset:
ld c, a ; number of tiles
jp CopyVideoData ; load tileset
anim_tileset: MACRO
MACRO anim_tileset
db \1
dw \2
db -1 ; padding

2
engine/battle/battle_transitions.asm
View file

@ -662,7 +662,7 @@ BattleTransition_Circle_Sub2:
const CIRCLE_LEFT
const CIRCLE_RIGHT
half_circle: MACRO
MACRO half_circle
; quadrant x, circle data, target coord
db \1
dw \2

4
engine/events/diploma.asm
View file

@ -1,4 +1,4 @@
CIRCLE_TILE_ID EQU $70
DEF CIRCLE_TILE_ID EQU $70
DisplayDiploma::
call SaveScreenTilesToBuffer2
@ -83,7 +83,7 @@ UnusedPlayerNameLengthFunc:
dec c
jr .loop
diploma_text: MACRO
MACRO diploma_text
dw \3
dwcoord \1, \2
ENDM

6
engine/events/hidden_objects/cinnabar_gym_quiz.asm
View file

@ -183,12 +183,12 @@ UpdateCinnabarGymGateTileBlocks_::
jr nz, .loop
ret
gym_gate_coord: MACRO
MACRO gym_gate_coord
db \1, \2, \3, 0
ENDM
HORIZONTAL_GATE_BLOCK EQU $54
VERTICAL_GATE_BLOCK EQU $5f
DEF HORIZONTAL_GATE_BLOCK EQU $54
DEF VERTICAL_GATE_BLOCK EQU $5f
CinnabarGymGateCoords:
; x coord, y coord, block id

4
engine/gfx/mon_icons.asm
View file

@ -280,8 +280,8 @@ GetPartyMonSpriteID:
INCLUDE "data/pokemon/menu_icons.asm"
INC_FRAME_1 EQUS "0, $20"
INC_FRAME_2 EQUS "$20, $20"
DEF INC_FRAME_1 EQUS "0, $20"
DEF INC_FRAME_2 EQUS "$20, $20"
BugIconFrame1: INCBIN "gfx/icons/bug.2bpp", INC_FRAME_1
PlantIconFrame1: INCBIN "gfx/icons/plant.2bpp", INC_FRAME_1

2
engine/items/town_map.asm
View file

@ -1,4 +1,4 @@
NOT_VISITED EQU $fe
DEF NOT_VISITED EQU $fe
DisplayTownMap:
call LoadTownMap

2
engine/movie/intro.asm
View file

@ -3,7 +3,7 @@
const MOVE_GENGAR_RIGHT
const MOVE_GENGAR_LEFT
ANIMATION_END EQU 80
DEF ANIMATION_END EQU 80
PlayIntro:
xor a

2
engine/movie/oak_speech/init_player_data.asm
View file

@ -21,7 +21,7 @@ InitPlayerData2:
ld hl, wNumBoxItems
call InitializeEmptyList
START_MONEY EQU $3000
DEF START_MONEY EQU $3000
ld hl, wPlayerMoney + 1
ld a, HIGH(START_MONEY)
ld [hld], a

6
engine/movie/trade.asm
View file

@ -56,12 +56,12 @@ TradeAnimCommon:
ld [wOptions], a
ret
addtradefunc: MACRO
MACRO addtradefunc
\1TradeFunc::
dw \1
ENDM
tradefunc: MACRO
MACRO tradefunc
db (\1TradeFunc - TradeFuncPointerTable) / 2
ENDM
@ -697,7 +697,7 @@ Trade_WriteCircleOAM:
jr nz, .loop
ret
trade_circle_oam: MACRO
MACRO trade_circle_oam
dw \1
db \2, \3
ENDM

2
engine/overworld/dust_smoke.asm
View file

@ -51,7 +51,7 @@ GetMoveBoulderDustFunctionPointer:
pop hl
ret
boulder_dust_adjust: MACRO
MACRO boulder_dust_adjust
db \1, \2 ; coords
dw \3 ; function
ENDM

2
engine/overworld/movement.asm
View file

@ -1,4 +1,4 @@
MAP_TILESET_SIZE EQU $60
DEF MAP_TILESET_SIZE EQU $60
UpdatePlayerSprite:
ld a, [wSpritePlayerStateData2WalkAnimationCounter]

2
engine/overworld/player_animations.asm
View file

@ -475,7 +475,7 @@ FishingRodOAM:
dbsprite 8, 10, 0, 0, $fe, 0 ; left
dbsprite 11, 10, 0, 0, $fe, OAM_HFLIP ; right
fishing_gfx: MACRO
MACRO fishing_gfx
dw \1
db \2
db BANK(\1)