mirror of
https://github.com/pret/pokeplatinum.git
synced 2024-10-06 19:03:32 +00:00
Fix FALSE and TRUE macros in btlcmd.inc, update comments in scrcmd.inc
This commit is contained in:
parent
c925fef0b9
commit
3caaa4d677
@ -21,3 +21,7 @@ src/overlay062/ov62_0223DFA8.c
|
||||
src/overlay062/ov62_0223CAEC.c
|
||||
src/overlay062/ov62_02231690.c
|
||||
src/overlay062/ov62_02237D24.c
|
||||
|
||||
# Do not format any .s or .inc file
|
||||
*.s
|
||||
*.inc
|
||||
|
@ -18,8 +18,8 @@
|
||||
.include "consts/moves.inc"
|
||||
.include "consts/pokemon.inc"
|
||||
|
||||
.equ FALSE 0
|
||||
.equ TRUE 1
|
||||
.equ FALSE, 0
|
||||
.equ TRUE, 1
|
||||
|
||||
.macro PlayEncounterAnimation
|
||||
.long 0
|
||||
@ -1235,4 +1235,4 @@
|
||||
.long 222
|
||||
.endm
|
||||
|
||||
.endif ; ASM_BATTLE_SCRIPT_INC
|
||||
.endif // ASM_BATTLE_SCRIPT_INC
|
||||
|
@ -102,9 +102,9 @@
|
||||
|
||||
.macro CompareVar varID, valueOrVarID
|
||||
.if \valueOrVarID < 0x4000
|
||||
.short 17 ; CompareVarToValue
|
||||
.short 17 /* CompareVarToValue */
|
||||
.else
|
||||
.short 18 ; CompareVarToVar
|
||||
.short 18 /* CompareVarToVar */
|
||||
.endif
|
||||
.short \varID
|
||||
.short \valueOrVarID
|
||||
@ -223,9 +223,9 @@
|
||||
|
||||
.macro SetVar destVarID, valueOrVarID
|
||||
.if \valueOrVarID < 0x4000
|
||||
.short 40 ; SetVarFromValue
|
||||
.short 40 /* SetVarFromValue */
|
||||
.else
|
||||
.short 41 ; SetVarFromVar
|
||||
.short 41 /* SetVarFromVar */
|
||||
.endif
|
||||
.short \destVarID
|
||||
.short \valueOrVarID
|
||||
@ -2695,8 +2695,8 @@
|
||||
.macro ScrCmd_1F8
|
||||
.short 504
|
||||
.endm
|
||||
|
||||
; this is a dummy function that doesn't do anything
|
||||
|
||||
/* this is a dummy function that doesn't do anything */
|
||||
.macro Dummy1 dummy
|
||||
.short 505
|
||||
.short \dummy
|
||||
@ -3735,7 +3735,7 @@
|
||||
.short \arg1
|
||||
.endm
|
||||
|
||||
; this is unused, but the underlying function is called from LockAll
|
||||
/* this is unused, but the underlying function is called from LockAll */
|
||||
.macro LockLastTalked
|
||||
.short 692
|
||||
.endm
|
||||
|
Loading…
Reference in New Issue
Block a user