Reorganize macros

This commit is contained in:
Remy Oukaour 2017-12-14 00:36:24 -05:00
parent 8745915dbd
commit e48a401290
48 changed files with 1637 additions and 2030 deletions

View File

@ -1,4 +1,3 @@
Moves: ; 41afb
; Characteristics of each move.
move: MACRO
@ -11,6 +10,8 @@ move: MACRO
db \7 percent ; effect chance
ENDM
Moves: ; 41afb
; entries correspond to constants/move_constants.asm
move POUND, EFFECT_NORMAL_HIT, 40, NORMAL, 100, 35, 0
move KARATE_CHOP, EFFECT_NORMAL_HIT, 50, FIGHTING, 100, 25, 0
move DOUBLESLAP, EFFECT_MULTI_HIT, 15, NORMAL, 85, 10, 0

File diff suppressed because it is too large Load Diff

View File

@ -1,12 +1,11 @@
AnimObjGFX: ; cfcf6
object_gfx: MACRO
; # tiles, label
db \1
dba \2
ENDM
AnimObjGFX: ; cfcf6
; entries correspond to ANIM_GFX_* constants
object_gfx 0, AnimObj00GFX
object_gfx 21, AnimObjHitGFX
object_gfx 6, AnimObjCutGFX

View File

@ -1,10 +1,9 @@
; BattleCommandPointers indexes (see battle/effect_commands.asm)
command: macro
enum \1_command
\1 equs "db \1_command"
endm
; BattleCommandPointers indexes (see battle/effect_commands.asm)
enum_start 1
command checkturn ; 01
command checkobedience ; 02

View File

@ -1,3 +1,18 @@
newgroup: macro
const_value = const_value + 1
enum_start 1
endm
mapgroup: macro
;\1: map id
;\2: height: in blocks
;\3: width: in blocks
GROUP_\1 EQU const_value
enum MAP_\1
\1_HEIGHT EQU \2
\1_WIDTH EQU \3
endm
; map group ids
; `newgroup` indexes are for:
; - MapGroupPointers (see maps/map_headers.asm)

View File

@ -1,3 +1,8 @@
trainerclass: MACRO
enum \1
const_value = 1
ENDM
; trainer class ids
; `trainerclass` indexes are for:
; - TrainerClassAttributes (see trainers/attributes.asm)

67
data/unown_words.asm Normal file
View File

@ -0,0 +1,67 @@
unownword: macro
x = 1
rept STRLEN(\1)
db STRSUB(\1, x, 1) - $40
x = x + 1
endr
db -1
endm
UnownWords: ; fba5a
; entries correspond to Unown forms
dw UnownWord1
dw UnownWord1
dw UnownWord2
dw UnownWord3
dw UnownWord4
dw UnownWord5
dw UnownWord6
dw UnownWord7
dw UnownWord8
dw UnownWord9
dw UnownWord10
dw UnownWord11
dw UnownWord12
dw UnownWord13
dw UnownWord14
dw UnownWord15
dw UnownWord16
dw UnownWord17
dw UnownWord18
dw UnownWord19
dw UnownWord20
dw UnownWord21
dw UnownWord22
dw UnownWord23
dw UnownWord24
dw UnownWord25
dw UnownWord26
; fba90
UnownWord1: unownword "ANGRY"
UnownWord2: unownword "BEAR"
UnownWord3: unownword "CHASE"
UnownWord4: unownword "DIRECT"
UnownWord5: unownword "ENGAGE"
UnownWord6: unownword "FIND"
UnownWord7: unownword "GIVE"
UnownWord8: unownword "HELP"
UnownWord9: unownword "INCREASE"
UnownWord10: unownword "JOIN"
UnownWord11: unownword "KEEP"
UnownWord12: unownword "LAUGH"
UnownWord13: unownword "MAKE"
UnownWord14: unownword "NUZZLE"
UnownWord15: unownword "OBSERVE"
UnownWord16: unownword "PERFORM"
UnownWord17: unownword "QUICKEN"
UnownWord18: unownword "REASSURE"
UnownWord19: unownword "SEARCH"
UnownWord20: unownword "TELL"
UnownWord21: unownword "UNDO"
UnownWord22: unownword "VANISH"
UnownWord23: unownword "WANT"
UnownWord24: unownword "XXXXX"
UnownWord25: unownword "YIELD"
UnownWord26: unownword "ZOOM"
; fbb32

View File

@ -363,19 +363,6 @@ StartTrainerBattle_SetUpForSpinOutro: ; 8c43d (23:443d)
ld [wcf64], a
ret
spintable_entry: MACRO
db \1
dw .wedge\2
dwcoord \3, \4
ENDM
; quadrants
const_def
const UPPER_LEFT
const UPPER_RIGHT
const LOWER_LEFT
const LOWER_RIGHT
StartTrainerBattle_SpinToBlack: ; 8c44f (23:444f)
xor a
ld [hBGMapMode], a
@ -412,7 +399,19 @@ endr
ret
; 8c490 (23:4490)
; quadrants
const_def
const UPPER_LEFT
const UPPER_RIGHT
const LOWER_LEFT
const LOWER_RIGHT
.spintable ; 8c490
spintable_entry: MACRO
db \1
dw .wedge\2
dwcoord \3, \4
ENDM
spintable_entry UPPER_LEFT, 1, 1, 6
spintable_entry UPPER_LEFT, 2, 0, 3
spintable_entry UPPER_LEFT, 3, 1, 0
@ -797,12 +796,6 @@ StartTrainerBattle_DrawSineWave: ; 8c6f7 (23:46f7)
sine_wave $100
; 8c768
zoombox: macro
; width, height, start y, start x
db \1, \2
dwcoord \3, \4
endm
StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
callba Function5602
ld de, .boxes
@ -835,6 +828,11 @@ StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
; 8c792 (23:4792)
.boxes ; 8c792
zoombox: macro
; width, height, start y, start x
db \1, \2
dwcoord \3, \4
endm
zoombox 4, 2, 8, 8
zoombox 6, 4, 7, 7
zoombox 8, 6, 6, 6

View File

@ -1415,7 +1415,6 @@ else
endc
endm
cardflip_cursor 11, 2, .Impossible
cardflip_cursor 12, 2, .Impossible
cardflip_cursor 13, 2, .PokeGroupPair

View File

@ -2340,11 +2340,11 @@ HasVisitedSpawn: ; 91c50
Flypoints: ; 91c5e
; landmark, spawn point
const_def
flypoint: MACRO
const FLY_\1
db \2, SPAWN_\1
ENDM
const_def
; Johto
flypoint NEW_BARK, NEW_BARK_TOWN
flypoint CHERRYGROVE, CHERRYGROVE_CITY

View File

@ -1,4 +1,3 @@
ProfOaksPC: ; 0x265d3
ld hl, OakPCText1
call MenuTextBox
@ -100,31 +99,26 @@ endr
ret
OakRatings: ; 0x2667f
oakrating: MACRO
db \1
dw \2, \3
endm
; if you caught at most this many, play this sound, load this text
oakrating 9, SFX_DEX_FANFARE_LESS_THAN_20, OakRating01
oakrating 19, SFX_DEX_FANFARE_LESS_THAN_20, OakRating02
oakrating 34, SFX_DEX_FANFARE_20_49, OakRating03
oakrating 49, SFX_DEX_FANFARE_20_49, OakRating04
oakrating 64, SFX_DEX_FANFARE_50_79, OakRating05
oakrating 79, SFX_DEX_FANFARE_50_79, OakRating06
oakrating 94, SFX_DEX_FANFARE_80_109, OakRating07
oakrating 109, SFX_DEX_FANFARE_80_109, OakRating08
oakrating 124, SFX_CAUGHT_MON, OakRating09
oakrating 139, SFX_CAUGHT_MON, OakRating10
oakrating 154, SFX_DEX_FANFARE_140_169, OakRating11
oakrating 169, SFX_DEX_FANFARE_140_169, OakRating12
oakrating 184, SFX_DEX_FANFARE_170_199, OakRating13
oakrating 199, SFX_DEX_FANFARE_170_199, OakRating14
oakrating 214, SFX_DEX_FANFARE_200_229, OakRating15
oakrating 229, SFX_DEX_FANFARE_200_229, OakRating16
oakrating 239, SFX_DEX_FANFARE_230_PLUS, OakRating17
oakrating 248, SFX_DEX_FANFARE_230_PLUS, OakRating18
oakrating 255, SFX_DEX_FANFARE_230_PLUS, OakRating19
dbww 9, SFX_DEX_FANFARE_LESS_THAN_20, OakRating01
dbww 19, SFX_DEX_FANFARE_LESS_THAN_20, OakRating02
dbww 34, SFX_DEX_FANFARE_20_49, OakRating03
dbww 49, SFX_DEX_FANFARE_20_49, OakRating04
dbww 64, SFX_DEX_FANFARE_50_79, OakRating05
dbww 79, SFX_DEX_FANFARE_50_79, OakRating06
dbww 94, SFX_DEX_FANFARE_80_109, OakRating07
dbww 109, SFX_DEX_FANFARE_80_109, OakRating08
dbww 124, SFX_CAUGHT_MON, OakRating09
dbww 139, SFX_CAUGHT_MON, OakRating10
dbww 154, SFX_DEX_FANFARE_140_169, OakRating11
dbww 169, SFX_DEX_FANFARE_140_169, OakRating12
dbww 184, SFX_DEX_FANFARE_170_199, OakRating13
dbww 199, SFX_DEX_FANFARE_170_199, OakRating14
dbww 214, SFX_DEX_FANFARE_200_229, OakRating15
dbww 229, SFX_DEX_FANFARE_200_229, OakRating16
dbww 239, SFX_DEX_FANFARE_230_PLUS, OakRating17
dbww 248, SFX_DEX_FANFARE_230_PLUS, OakRating18
dbww 255, SFX_DEX_FANFARE_230_PLUS, OakRating19
OakPCText1: ; 0x266de
text_jump _OakPCText1

View File

@ -1578,7 +1578,6 @@ BuenasPassword4:
.greater_than_11
call Random
maskbits NUM_PASSWORD_CATEGORIES
and x
cp NUM_PASSWORD_CATEGORIES
jr nc, .greater_than_11
; Store it in the high nybble of e.

View File

@ -196,10 +196,6 @@ endr
ret
; 8c0e5
brightlevel: MACRO
db (\1 << 6) | (\2 << 4) | (\3 << 2) | \4
ENDM
ReplaceTimeOfDayPals: ; 8c0e5
ld hl, .BrightnessLevels
ld a, [wMapTimeOfDay]
@ -230,14 +226,14 @@ ReplaceTimeOfDayPals: ; 8c0e5
; 8c10f (23:410f)
.BrightnessLevels: ; 8c10f
brightlevel 3, 2, 1, 0
brightlevel 1, 1, 1, 1
brightlevel 2, 2, 2, 2
brightlevel 0, 0, 0, 0
brightlevel 3, 3, 3, 3
brightlevel 3, 2, 1, 0
brightlevel 3, 2, 1, 0
brightlevel 3, 2, 1, 0
dc 3, 2, 1, 0
dc 1, 1, 1, 1
dc 2, 2, 2, 2
dc 0, 0, 0, 0
dc 3, 3, 3, 3
dc 3, 2, 1, 0
dc 3, 2, 1, 0
dc 3, 2, 1, 0
; 8c117
GetTimePalette: ; 8c117

View File

@ -1,7 +1,8 @@
puzcoord EQUS "* 6 +"
PUZZLE_BORDER EQU $ee
PUZZLE_VOID EQU $ef
puzcoord EQUS "* 6 +"
UnownPuzzle: ; e1190
ld a, [hInMenu]
push af

View File

@ -19,7 +19,6 @@ UpdateUnownDex: ; fba18
ret
; fba2e
PrintUnownWord: ; fba2e (3e:7a2e)
hlcoord 4, 15
ld bc, 12
@ -49,70 +48,4 @@ PrintUnownWord: ; fba2e (3e:7a2e)
jr .loop
; fba5a (3e:7a5a)
UnownWords: ; fba5a
dw UnownWord1
dw UnownWord1
dw UnownWord2
dw UnownWord3
dw UnownWord4
dw UnownWord5
dw UnownWord6
dw UnownWord7
dw UnownWord8
dw UnownWord9
dw UnownWord10
dw UnownWord11
dw UnownWord12
dw UnownWord13
dw UnownWord14
dw UnownWord15
dw UnownWord16
dw UnownWord17
dw UnownWord18
dw UnownWord19
dw UnownWord20
dw UnownWord21
dw UnownWord22
dw UnownWord23
dw UnownWord24
dw UnownWord25
dw UnownWord26
; fba90
unownword: macro
x = 1
rept STRLEN(\1)
db STRSUB(\1, x, 1) - $40
x = x + 1
endr
db -1
endm
UnownWord1: unownword "ANGRY"
UnownWord2: unownword "BEAR"
UnownWord3: unownword "CHASE"
UnownWord4: unownword "DIRECT"
UnownWord5: unownword "ENGAGE"
UnownWord6: unownword "FIND"
UnownWord7: unownword "GIVE"
UnownWord8: unownword "HELP"
UnownWord9: unownword "INCREASE"
UnownWord10: unownword "JOIN"
UnownWord11: unownword "KEEP"
UnownWord12: unownword "LAUGH"
UnownWord13: unownword "MAKE"
UnownWord14: unownword "NUZZLE"
UnownWord15: unownword "OBSERVE"
UnownWord16: unownword "PERFORM"
UnownWord17: unownword "QUICKEN"
UnownWord18: unownword "REASSURE"
UnownWord19: unownword "SEARCH"
UnownWord20: unownword "TELL"
UnownWord21: unownword "UNDO"
UnownWord22: unownword "VANISH"
UnownWord23: unownword "WANT"
UnownWord24: unownword "XXXXX"
UnownWord25: unownword "YIELD"
UnownWord26: unownword "ZOOM"
; fbb32
INCLUDE "data/unown_words.asm"

View File

@ -1,5 +1,3 @@
SpecialHoOhChamber: ; 0x8addb
ld hl, PartySpecies
ld a, [hl]

View File

@ -1,6 +1,5 @@
; Pic animation arrangement.
AnimateMon_Slow_Normal: ; d0000
hlcoord 12, 0
ld a, [wBattleMode]
@ -53,23 +52,18 @@ AnimateMon_Unused: ; d003a
ret
; d0042
POKEANIM: MACRO
pokeanim: MACRO
rept _NARG
; Workaround for a bug where macro args can't come after the start of a symbol
if !def(\1_POKEANIM)
\1_POKEANIM equs "PokeAnim_\1_"
endc
db (\1_POKEANIM - PokeAnim_SetupCommands) / 2
shift
endr
db (PokeAnim_Finish_ - PokeAnim_SetupCommands) / 2
ENDM
PokeAnims: ; d0042
dw .Slow
dw .Normal
@ -81,15 +75,15 @@ PokeAnims: ; d0042
dw .Egg1
dw .Egg2
.Slow: POKEANIM StereoCry, Setup2, Play
.Normal: POKEANIM StereoCry, Setup, Play
.Menu: POKEANIM CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
.Trade: POKEANIM Extra, Play2, Extra, Play, SetWait, Wait, Cry, Setup, Play
.Evolve: POKEANIM Extra, Play, SetWait, Wait, CryNoWait, Setup, Play
.Hatch: POKEANIM Extra, Play, CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
.Unused: POKEANIM CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
.Egg1: POKEANIM Setup, Play
.Egg2: POKEANIM Extra, Play
.Slow: pokeanim StereoCry, Setup2, Play
.Normal: pokeanim StereoCry, Setup, Play
.Menu: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
.Trade: pokeanim Extra, Play2, Extra, Play, SetWait, Wait, Cry, Setup, Play
.Evolve: pokeanim Extra, Play, SetWait, Wait, CryNoWait, Setup, Play
.Hatch: pokeanim Extra, Play, CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
.Unused: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
.Egg1: pokeanim Setup, Play
.Egg2: pokeanim Extra, Play
AnimateFrontpic: ; d008e

File diff suppressed because it is too large Load Diff

View File

@ -1,54 +1,54 @@
UnownPicPointers::
; entries correspond to Unown letters, two apiece
add_pic UnownAFrontpic
add_pic UnownABackpic
add_pic UnownBFrontpic
add_pic UnownBBackpic
add_pic UnownCFrontpic
add_pic UnownCBackpic
add_pic UnownDFrontpic
add_pic UnownDBackpic
add_pic UnownEFrontpic
add_pic UnownEBackpic
add_pic UnownFFrontpic
add_pic UnownFBackpic
add_pic UnownGFrontpic
add_pic UnownGBackpic
add_pic UnownHFrontpic
add_pic UnownHBackpic
add_pic UnownIFrontpic
add_pic UnownIBackpic
add_pic UnownJFrontpic
add_pic UnownJBackpic
add_pic UnownKFrontpic
add_pic UnownKBackpic
add_pic UnownLFrontpic
add_pic UnownLBackpic
add_pic UnownMFrontpic
add_pic UnownMBackpic
add_pic UnownNFrontpic
add_pic UnownNBackpic
add_pic UnownOFrontpic
add_pic UnownOBackpic
add_pic UnownPFrontpic
add_pic UnownPBackpic
add_pic UnownQFrontpic
add_pic UnownQBackpic
add_pic UnownRFrontpic
add_pic UnownRBackpic
add_pic UnownSFrontpic
add_pic UnownSBackpic
add_pic UnownTFrontpic
add_pic UnownTBackpic
add_pic UnownUFrontpic
add_pic UnownUBackpic
add_pic UnownVFrontpic
add_pic UnownVBackpic
add_pic UnownWFrontpic
add_pic UnownWBackpic
add_pic UnownXFrontpic
add_pic UnownXBackpic
add_pic UnownYFrontpic
add_pic UnownYBackpic
add_pic UnownZFrontpic
add_pic UnownZBackpic
dba_pic UnownAFrontpic
dba_pic UnownABackpic
dba_pic UnownBFrontpic
dba_pic UnownBBackpic
dba_pic UnownCFrontpic
dba_pic UnownCBackpic
dba_pic UnownDFrontpic
dba_pic UnownDBackpic
dba_pic UnownEFrontpic
dba_pic UnownEBackpic
dba_pic UnownFFrontpic
dba_pic UnownFBackpic
dba_pic UnownGFrontpic
dba_pic UnownGBackpic
dba_pic UnownHFrontpic
dba_pic UnownHBackpic
dba_pic UnownIFrontpic
dba_pic UnownIBackpic
dba_pic UnownJFrontpic
dba_pic UnownJBackpic
dba_pic UnownKFrontpic
dba_pic UnownKBackpic
dba_pic UnownLFrontpic
dba_pic UnownLBackpic
dba_pic UnownMFrontpic
dba_pic UnownMBackpic
dba_pic UnownNFrontpic
dba_pic UnownNBackpic
dba_pic UnownOFrontpic
dba_pic UnownOBackpic
dba_pic UnownPFrontpic
dba_pic UnownPBackpic
dba_pic UnownQFrontpic
dba_pic UnownQBackpic
dba_pic UnownRFrontpic
dba_pic UnownRBackpic
dba_pic UnownSFrontpic
dba_pic UnownSBackpic
dba_pic UnownTFrontpic
dba_pic UnownTBackpic
dba_pic UnownUFrontpic
dba_pic UnownUBackpic
dba_pic UnownVFrontpic
dba_pic UnownVBackpic
dba_pic UnownWFrontpic
dba_pic UnownWBackpic
dba_pic UnownXFrontpic
dba_pic UnownXBackpic
dba_pic UnownYFrontpic
dba_pic UnownYBackpic
dba_pic UnownZFrontpic
dba_pic UnownZBackpic

View File

@ -1,69 +1,69 @@
TrainerPicPointers::
; entries correspond to trainer classes (see constants/trainer_constants.asm)
add_pic FalknerPic
add_pic WhitneyPic
add_pic BugsyPic
add_pic MortyPic
add_pic PrycePic
add_pic JasminePic
add_pic ChuckPic
add_pic ClairPic
add_pic Rival1Pic
add_pic PokemonProfPic
add_pic WillPic
add_pic CalPic
add_pic BrunoPic
add_pic KarenPic
add_pic KogaPic
add_pic ChampionPic
add_pic BrockPic
add_pic MistyPic
add_pic LtSurgePic
add_pic ScientistPic
add_pic ErikaPic
add_pic YoungsterPic
add_pic SchoolboyPic
add_pic BirdKeeperPic
add_pic LassPic
add_pic JaninePic
add_pic CooltrainermPic
add_pic CooltrainerfPic
add_pic BeautyPic
add_pic PokemaniacPic
add_pic GruntmPic
add_pic GentlemanPic
add_pic SkierPic
add_pic TeacherPic
add_pic SabrinaPic
add_pic BugCatcherPic
add_pic FisherPic
add_pic SwimmermPic
add_pic SwimmerfPic
add_pic SailorPic
add_pic SuperNerdPic
add_pic Rival2Pic
add_pic GuitaristPic
add_pic HikerPic
add_pic BikerPic
add_pic BlainePic
add_pic BurglarPic
add_pic FirebreatherPic
add_pic JugglerPic
add_pic BlackbeltTPic
add_pic ExecutivemPic
add_pic PsychicTPic
add_pic PicnickerPic
add_pic CamperPic
add_pic ExecutivefPic
add_pic SagePic
add_pic MediumPic
add_pic BoarderPic
add_pic PokefanmPic
add_pic KimonoGirlPic
add_pic TwinsPic
add_pic PokefanfPic
add_pic RedPic
add_pic BluePic
add_pic OfficerPic
add_pic GruntfPic
add_pic MysticalmanPic
dba_pic FalknerPic
dba_pic WhitneyPic
dba_pic BugsyPic
dba_pic MortyPic
dba_pic PrycePic
dba_pic JasminePic
dba_pic ChuckPic
dba_pic ClairPic
dba_pic Rival1Pic
dba_pic PokemonProfPic
dba_pic WillPic
dba_pic CalPic
dba_pic BrunoPic
dba_pic KarenPic
dba_pic KogaPic
dba_pic ChampionPic
dba_pic BrockPic
dba_pic MistyPic
dba_pic LtSurgePic
dba_pic ScientistPic
dba_pic ErikaPic
dba_pic YoungsterPic
dba_pic SchoolboyPic
dba_pic BirdKeeperPic
dba_pic LassPic
dba_pic JaninePic
dba_pic CooltrainermPic
dba_pic CooltrainerfPic
dba_pic BeautyPic
dba_pic PokemaniacPic
dba_pic GruntmPic
dba_pic GentlemanPic
dba_pic SkierPic
dba_pic TeacherPic
dba_pic SabrinaPic
dba_pic BugCatcherPic
dba_pic FisherPic
dba_pic SwimmermPic
dba_pic SwimmerfPic
dba_pic SailorPic
dba_pic SuperNerdPic
dba_pic Rival2Pic
dba_pic GuitaristPic
dba_pic HikerPic
dba_pic BikerPic
dba_pic BlainePic
dba_pic BurglarPic
dba_pic FirebreatherPic
dba_pic JugglerPic
dba_pic BlackbeltTPic
dba_pic ExecutivemPic
dba_pic PsychicTPic
dba_pic PicnickerPic
dba_pic CamperPic
dba_pic ExecutivefPic
dba_pic SagePic
dba_pic MediumPic
dba_pic BoarderPic
dba_pic PokefanmPic
dba_pic KimonoGirlPic
dba_pic TwinsPic
dba_pic PokefanfPic
dba_pic RedPic
dba_pic BluePic
dba_pic OfficerPic
dba_pic GruntfPic
dba_pic MysticalmanPic

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