Skip to content

Commit

Permalink
Cleaned trailing whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
AsparagusEduardo committed Sep 11, 2022
1 parent 91cba0e commit 65108c3
Show file tree
Hide file tree
Showing 51 changed files with 204 additions and 204 deletions.
6 changes: 3 additions & 3 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ cd /mnt/c/Users/<user>/Desktop/decomps
> Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "/mnt/c/users/<user>/Desktop/decomp folder"`.
> Note 3: Windows path names are case-insensitive so adhering to capitalization isn't needed
</details>
If this works, then proceed to [Installation](#installation).

Otherwise, ask for help on Discord or IRC (see [README.md](README.md)), or continue reading below for [Windows instructions using msys2](#windows-msys2).
Expand Down Expand Up @@ -216,7 +216,7 @@ Note that the directory **must exist** in Windows. If you want to store pokeemer
> Note 1: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "c:/users/<user>/Desktop/decomp folder"`.
> Note 2: Windows path names are case-insensitive so adhering to capitalization isn't needed
</details>
If this works, then proceed to [Installation](#installation). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)).
## macOS
Expand Down Expand Up @@ -539,7 +539,7 @@ devkitARM is now installed.
devkitARM is now installed.

### Installing devkitARM on Arch Linux

1. Follow [devkitPro's instructions](https://devkitpro.org/wiki/devkitPro_pacman#Customising_Existing_Pacman_Install) to configure `pacman` to download devkitPro packages.
2. Install `gba-dev`: run the following command as root.
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ tidynonmodern:
tidymodern:
rm -f $(MODERN_ROM_NAME) $(MODERN_ELF_NAME) $(MODERN_MAP_NAME)
rm -rf $(MODERN_OBJ_DIR_NAME)

ifneq ($(MODERN),0)
$(C_BUILDDIR)/berry_crush.o: override CFLAGS += -Wno-address-of-packed-member
endif
Expand Down Expand Up @@ -410,7 +410,7 @@ LD_SCRIPT := ld_script.txt
LD_SCRIPT_DEPS := $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld
else
LD_SCRIPT := ld_script_modern.txt
LD_SCRIPT_DEPS :=
LD_SCRIPT_DEPS :=
endif

$(OBJ_DIR)/ld_script.ld: $(LD_SCRIPT) $(LD_SCRIPT_DEPS)
Expand Down
26 changes: 13 additions & 13 deletions asm/macros/battle_ai_script.inc
Original file line number Diff line number Diff line change
Expand Up @@ -550,38 +550,38 @@
.2byte \param1
.4byte \param2
.endm

@ useful script macros
.macro get_curr_move_type
get_type AI_TYPE_MOVE
.endm

.macro get_user_type1
get_type AI_TYPE1_USER
.endm

.macro get_user_type2
get_type AI_TYPE2_USER
.endm

.macro get_target_type1
get_type AI_TYPE1_TARGET
.endm

.macro get_target_type2
get_type AI_TYPE2_TARGET
.endm

.macro if_ability battler:req, ability:req, ptr:req
check_ability \battler, \ability
if_equal 1, \ptr
.endm

.macro if_no_ability battler:req, ability:req, ptr:req
check_ability \battler, \ability
if_equal 0, \ptr
.endm

.macro if_type battler:req, type:req, ptr:req
is_of_type \battler, \type
if_equal 1, \ptr
Expand All @@ -591,20 +591,20 @@
is_of_type \battler, \type
if_equal 0, \ptr
.endm

.macro if_target_faster ptr:req
if_user_goes 1, \ptr
.endm

.macro if_user_faster ptr:req
if_user_goes 0, \ptr
.endm

.macro if_double_battle ptr:req
is_double_battle
if_equal 1, \ptr
.endm

.macro if_not_double_battle ptr:req
is_double_battle
if_equal 0, \ptr
Expand All @@ -613,7 +613,7 @@
.macro if_any_move_disabled battler:req, ptr:req
if_any_move_disabled_or_encored \battler, 0, \ptr
.endm

.macro if_any_move_encored battler:req, ptr:req
if_any_move_disabled_or_encored \battler, 1, \ptr
.endm
6 changes: 3 additions & 3 deletions asm/macros/battle_anim_script.inc
Original file line number Diff line number Diff line change
Expand Up @@ -270,16 +270,16 @@
.macro stopsound
.byte 0x2f
.endm

@ useful macros
.macro jumpreteq value:req, ptr:req
jumpargeq ARG_RET_ID, \value, \ptr
.endm

.macro jumprettrue ptr:req
jumpreteq TRUE, \ptr
.endm

.macro jumpretfalse ptr:req
jumpreteq FALSE, \ptr
.endm
Loading

0 comments on commit 65108c3

Please sign in to comment.