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

endm -> ENDM

Browse Source
This commit is contained in:
xCrystal
2017-12-28 22:31:16 +01:00
parent 43a1e5b5ba
commit 50fc9c3389
42 changed files with 464 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
constants/deco_constants.asm
View File

@@ -57,7 +57,7 @@ const_value = 1
deco: MACRO deco: MACRO
const DECO_\1 const DECO_\1
enum DECOFLAG_\1 enum DECOFLAG_\1
endm ENDM
; decorations: ; decorations:
; - DecorationAttributes (see data/decorations/attributes.asm) ; - DecorationAttributes (see data/decorations/attributes.asm)

4
constants/map_constants.asm
View File

@@ -1,7 +1,7 @@
newgroup: MACRO newgroup: MACRO
const_value = const_value + 1 const_value = const_value + 1
enum_start 1 enum_start 1
endm ENDM
mapgroup: MACRO mapgroup: MACRO
;\1: map id ;\1: map id
@@ -11,7 +11,7 @@ GROUP_\1 EQU const_value
enum MAP_\1 enum MAP_\1
\1_HEIGHT EQU \2 \1_HEIGHT EQU \2
\1_WIDTH EQU \3 \1_WIDTH EQU \3
endm ENDM
; map group ids ; map group ids
; `newgroup` indexes are for: ; `newgroup` indexes are for:

2
data/battle_anims/objects.asm
View File

@@ -14,7 +14,7 @@ battleanimobj: MACRO
db \4 ; callback db \4 ; callback
db \5 ; palette db \5 ; palette
db \6 ; tile offset db \6 ; tile offset
endm ENDM
BattleAnimObjects: ; ccb56 BattleAnimObjects: ; ccb56
; entries correspond to ANIM_OBJ_* constants ; entries correspond to ANIM_OBJ_* constants

2
data/map_objects.asm
View File

@@ -1,7 +1,7 @@
sprite_movement_data: MACRO sprite_movement_data: MACRO
db \1, \2, \3, \4, \5 db \1, \2, \3, \4, \5
dn \6, 0 dn \6, 0
endm ENDM
SpriteMovementData:: ; 4273 SpriteMovementData:: ; 4273
; entries correspond to SPRITEMOVEDATA_* constants ; entries correspond to SPRITEMOVEDATA_* constants

2
data/odd_eggs.asm
View File

@@ -1,7 +1,7 @@
prob: MACRO prob: MACRO
prob_total = prob_total + (\1) prob_total = prob_total + (\1)
dw prob_total * $ffff / 100 dw prob_total * $ffff / 100
endm ENDM
OddEggProbabilities: OddEggProbabilities:
prob_total = 0 prob_total = 0

2
data/palettes/town_map.asm
View File

@@ -12,7 +12,7 @@ rept _NARG / 2
shift shift
shift shift
endr endr
endm ENDM
; gfx/pokegear/town_map.png ; gfx/pokegear/town_map.png
townmappals EARTH, EARTH, EARTH, MOUNTAIN, MOUNTAIN, MOUNTAIN townmappals EARTH, EARTH, EARTH, MOUNTAIN, MOUNTAIN, MOUNTAIN

2
data/phone_contacts.asm
View File

@@ -6,7 +6,7 @@ phone: MACRO
dba \5 dba \5
db \6 db \6
dba \7 dba \7
endm ENDM
PhoneContacts: ; 9045f PhoneContacts: ; 9045f
; entries correspond to PHONE_* constants ; entries correspond to PHONE_* constants

2
data/phone_special.asm
View File

@@ -3,7 +3,7 @@ specialcall: MACRO
dw \1 dw \1
db \2 db \2
dba \3 dba \3
endm ENDM
SpecialPhoneCallList: ; 90627 SpecialPhoneCallList: ; 90627
; entries correspond to SPECIALCALL_* constants ; entries correspond to SPECIALCALL_* constants

2
data/unown_words.asm
View File

@@ -5,7 +5,7 @@ x = 1
x = x + 1 x = x + 1
endr endr
db -1 db -1
endm ENDM
UnownWords: ; fba5a UnownWords: ; fba5a
; entries correspond to Unown forms ; entries correspond to Unown forms

2
data/wild/roammon_maps.asm
View File

@@ -10,7 +10,7 @@ rept \2
shift shift
endr endr
db 0 db 0
endm ENDM
RoamMaps: ; 2a40f RoamMaps: ; 2a40f
roam_map ROUTE_29, 2, ROUTE_30, ROUTE_46 roam_map ROUTE_29, 2, ROUTE_30, ROUTE_46

2
data/wild/treemon_maps.asm
View File

@@ -1,7 +1,7 @@
treemon_map: MACRO treemon_map: MACRO
map \1 map \1
db \2 ; treemon set db \2 ; treemon set
endm ENDM
TreeMonMaps: ; b825e TreeMonMaps: ; b825e
treemon_map ROUTE_26, 4 treemon_map ROUTE_26, 4

2
engine/battle/battle_transition.asm
View File

@@ -832,7 +832,7 @@ zoombox: MACRO
; width, height, start y, start x ; width, height, start y, start x
db \1, \2 db \1, \2
dwcoord \3, \4 dwcoord \3, \4
endm ENDM
zoombox 4, 2, 8, 8 zoombox 4, 2, 8, 8
zoombox 6, 4, 7, 7 zoombox 6, 4, 7, 7
zoombox 8, 6, 6, 6 zoombox 8, 6, 6, 6

2
engine/battle_anims/bg_effects.asm
View File

@@ -871,7 +871,7 @@ BattleBGEffect_RunPicResizeScript: ; c83ed (32:43ed)
bgsquare: MACRO bgsquare: MACRO
dn \1, \2 dn \1, \2
dw \3 dw \3
endm ENDM
bgsquare 6, 6, .SixBySix bgsquare 6, 6, .SixBySix
bgsquare 4, 4, .FourByFour bgsquare 4, 4, .FourByFour

2
engine/billspc.asm
View File

@@ -1450,7 +1450,7 @@ ENDC
ld a, [wd004] ld a, [wd004]
inc a inc a
ld [wBillsPC_NumMonsInBox], a ld [wBillsPC_NumMonsInBox], a
endm ENDM
CopyBoxmonSpecies: ; e2d30 (38:6d30) CopyBoxmonSpecies: ; e2d30 (38:6d30)
xor a xor a

2
engine/card_flip.asm
View File

@@ -1413,7 +1413,7 @@ else
dbpixel \1, \2 dbpixel \1, \2
dw \3 dw \3
endc endc
endm ENDM
cardflip_cursor 11, 2, .Impossible cardflip_cursor 11, 2, .Impossible
cardflip_cursor 12, 2, .Impossible cardflip_cursor 12, 2, .Impossible

2
engine/events/crystal_unown.asm
View File

@@ -178,7 +178,7 @@ endc
shift shift
endr endr
db $ff db $ff
endm ENDM
.UnownText_Escape: .UnownText_Escape:
; db $08, $44, $04, $00, $2e, $08, $ff ; db $08, $44, $04, $00, $2e, $08, $ff

2
engine/events/print_unown_2.asm
View File

@@ -105,7 +105,7 @@ x = x +- \2
endr endr
y = y + 1 y = y + 1
endr endr
endm ENDM
UnownPrinter_OverworldMapRectangle: ; e008b UnownPrinter_OverworldMapRectangle: ; e008b
overworldmaprect 7, 7 overworldmaprect 7, 7

4
engine/pic_animation.asm
View File

@@ -144,7 +144,7 @@ SetUpPokeAnim: ; d00b4
PokeAnim_SetupCommands: ; d00da PokeAnim_SetupCommands: ; d00da
setup_command: MACRO setup_command: MACRO
\1_: dw \1 \1_: dw \1
endm ENDM
setup_command PokeAnim_Finish setup_command PokeAnim_Finish
setup_command PokeAnim_BasePic setup_command PokeAnim_BasePic
setup_command PokeAnim_SetWait setup_command PokeAnim_SetWait
@@ -586,7 +586,7 @@ x = x + 1
endr endr
y = y + 7 y = y + 7
endr endr
endm ENDM
PokeAnim_ConvertAndApplyBitmask: ; d036b PokeAnim_ConvertAndApplyBitmask: ; d036b
xor a xor a

4
engine/unown_puzzle.asm
View File

@@ -120,7 +120,7 @@ rept _NARG / 2
shift shift
shift shift
endr endr
endm ENDM
initpuzcoord 0,0, 0,1, 0,2, 0,3, 0,4, 0,5 initpuzcoord 0,0, 0,1, 0,2, 0,3, 0,4, 0,5
initpuzcoord 1,0, 1,5 initpuzcoord 1,0, 1,5
initpuzcoord 2,0, 2,5 initpuzcoord 2,0, 2,5
@@ -603,7 +603,7 @@ puzzle_coords: MACRO
dbpixel \1, \2, \3, \4 dbpixel \1, \2, \3, \4
dwcoord \5, \6 dwcoord \5, \6
db \7, \8 db \7, \8
endm ENDM
; OAM coords, tilemap coords, vacant tile, filler ; OAM coords, tilemap coords, vacant tile, filler
puzzle_coords 3, 3, 4, 4, 1, 0, PUZZLE_BORDER, 0 puzzle_coords 3, 3, 4, 4, 1, 0, PUZZLE_BORDER, 0
puzzle_coords 6, 3, 4, 4, 4, 0, PUZZLE_BORDER, 0 puzzle_coords 6, 3, 4, 4, 4, 0, PUZZLE_BORDER, 0

6
home/text.asm
View File

@@ -207,14 +207,14 @@ else
cp \1 cp \1
endc endc
jp z, \2 jp z, \2
endm ENDM
dict2: MACRO dict2: MACRO
cp \1 cp \1
jr nz, ._\@ jr nz, ._\@
ld a, \2 ld a, \2
._\@: ._\@:
endm ENDM
dict "<DAY>", Char15 dict "<DAY>", Char15
dict "<LINE>", LineChar dict "<LINE>", LineChar
@@ -313,7 +313,7 @@ print_name: MACRO
push de push de
ld de, \1 ld de, \1
jp PlaceCommandCharacter jp PlaceCommandCharacter
endm ENDM
PrintMomsName: print_name MomsName ; 1186 PrintMomsName: print_name MomsName ; 1186
PrintPlayerName: print_name PlayerName ; 118d PrintPlayerName: print_name PlayerName ; 118d

Some files were not shown because too many files have changed in this diff Show More