pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Struct macros should have their main label outside the macro

Browse Source
This commit is contained in:
Rangi 2018-01-23 11:40:32 -05:00
parent fdda670f40
commit 682548493b
3 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
macros/wram.asm
View File

@ -103,7 +103,6 @@ battle_struct: MACRO
ENDM ENDM
box: MACRO box: MACRO
\1::
\1Count:: db \1Count:: db
\1Species:: ds MONS_PER_BOX + 1 \1Species:: ds MONS_PER_BOX + 1
\1Mons:: \1Mons::
@ -285,7 +284,6 @@ slot_reel: MACRO
ENDM ENDM
object_struct: MACRO object_struct: MACRO
\1Struct::
\1Sprite:: db \1Sprite:: db
\1MapObjectIndex:: db \1MapObjectIndex:: db
\1SpriteTile:: db \1SpriteTile:: db
@ -323,7 +321,6 @@ object_struct: MACRO
ENDM ENDM
map_object: MACRO map_object: MACRO
\1Object::
\1ObjectStructID:: db \1ObjectStructID:: db
\1ObjectSprite:: db \1ObjectSprite:: db
\1ObjectYCoord:: db \1ObjectYCoord:: db

31
sram.asm
View File

@ -122,7 +122,7 @@ sCheckValue2:: db ; loaded with SAVE_CHECK_VALUE_2, used to check save corruptio
SECTION "Active Box", SRAM SECTION "Active Box", SRAM
; ad10 ; ad10
box sBox sBox:: box sBox
; b160 ; b160
ds $f4 ds $f4
@ -220,24 +220,25 @@ sBTPkmnPrevPrevTrainer3:: db
SECTION "Boxes 1-7", SRAM, BANK [2] SECTION "Boxes 1-7", SRAM, BANK [2]
box sBox1 sBox1:: box sBox1
box sBox2 sBox2:: box sBox2
box sBox3 sBox3:: box sBox3
box sBox4 sBox4:: box sBox4
box sBox5 sBox5:: box sBox5
box sBox6 sBox6:: box sBox6
box sBox7 sBox7:: box sBox7
SECTION "Boxes 8-14", SRAM SECTION "Boxes 8-14", SRAM
box sBox8 sBox8:: box sBox8
box sBox9 sBox9:: box sBox9
box sBox10 sBox10:: box sBox10
box sBox11 sBox11:: box sBox11
box sBox12 sBox12:: box sBox12
box sBox13 sBox13:: box sBox13
box sBox14 sBox14:: box sBox14
SECTION "SRAM Mobile", SRAM, BANK [5] SECTION "SRAM Mobile", SRAM, BANK [5]

58
wram.asm
View File

@ -2364,19 +2364,19 @@ wFollowerMovementQueueLength:: db
wFollowMovementQueue:: ds 5 wFollowMovementQueue:: ds 5
ObjectStructs:: ; d4d6 ObjectStructs:: ; d4d6
object_struct Player PlayerStruct:: object_struct Player
object_struct Object1 Object1Struct:: object_struct Object1
object_struct Object2 Object2Struct:: object_struct Object2
object_struct Object3 Object3Struct:: object_struct Object3
object_struct Object4 Object4Struct:: object_struct Object4
object_struct Object5 Object5Struct:: object_struct Object5
object_struct Object6 Object6Struct:: object_struct Object6
object_struct Object7 Object7Struct:: object_struct Object7
object_struct Object8 Object8Struct:: object_struct Object8
object_struct Object9 Object9Struct:: object_struct Object9
object_struct Object10 Object10Struct:: object_struct Object10
object_struct Object11 Object11Struct:: object_struct Object11
object_struct Object12 Object12Struct:: object_struct Object12
ObjectStructsEnd:: ; d6de ObjectStructsEnd:: ; d6de
wCmdQueue:: ds CMDQUEUE_CAPACITY * CMDQUEUE_ENTRY_SIZE wCmdQueue:: ds CMDQUEUE_CAPACITY * CMDQUEUE_ENTRY_SIZE
@ -2384,22 +2384,22 @@ wCmdQueue:: ds CMDQUEUE_CAPACITY * CMDQUEUE_ENTRY_SIZE
ds 40 ds 40
MapObjects:: ; d71e MapObjects:: ; d71e
map_object Player PlayerObject:: map_object Player
map_object Map1 Map1Object:: map_object Map1
map_object Map2 Map2Object:: map_object Map2
map_object Map3 Map3Object:: map_object Map3
map_object Map4 Map4Object:: map_object Map4
map_object Map5 Map5Object:: map_object Map5
map_object Map6 Map6Object:: map_object Map6
map_object Map7 Map7Object:: map_object Map7
map_object Map8 Map8Object:: map_object Map8
map_object Map9 Map9Object:: map_object Map9
map_object Map10 Map10Object:: map_object Map10
map_object Map11 Map11Object:: map_object Map11
map_object Map12 Map12Object:: map_object Map12
map_object Map13 Map13Object:: map_object Map13
map_object Map14 Map14Object:: map_object Map14
map_object Map15 Map15Object:: map_object Map15
MapObjectsEnd:: MapObjectsEnd::
wObjectMasks:: ds NUM_OBJECTS ; d81e wObjectMasks:: ds NUM_OBJECTS ; d81e