diff options
| author | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-15 08:36:58 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-15 08:36:58 -0400 |
| commit | aee8501a10f99a5db01870426fe9b06dc6d35acc (patch) | |
| tree | ddf8dc8186f8cca6f6736d002dab091098649eb9 /constants | |
| parent | faffe1c1b8fbcb64a13d82530c91c995ffe4f501 (diff) | |
| parent | b78f2edbc3b3b2d01fc0590310a8d9e65648ee44 (diff) | |
Merge branch 'master' of https://github.com/pret/pokegold-spaceworld
Diffstat (limited to 'constants')
| -rwxr-xr-x | constants/item_data_constants.asm | 2 | ||||
| -rw-r--r-- | constants/main_menu_constants.asm | 2 | ||||
| -rwxr-xr-x | constants/name_constants.asm | 2 | ||||
| -rwxr-xr-x | constants/script_constants.asm | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm index 1354a40..80dfd14 100755 --- a/constants/item_data_constants.asm +++ b/constants/item_data_constants.asm @@ -125,5 +125,3 @@ MAX_PC_ITEMS EQU 50 const HELD_BRIGHTPOWDER const HELD_78 const HELD_FOCUS_BAND - - diff --git a/constants/main_menu_constants.asm b/constants/main_menu_constants.asm index 033e396..bd789ea 100644 --- a/constants/main_menu_constants.asm +++ b/constants/main_menu_constants.asm @@ -9,4 +9,4 @@ const NEW_GAME const OPTION const PLAY_POKEMON - const SET_TIME
\ No newline at end of file + const SET_TIME diff --git a/constants/name_constants.asm b/constants/name_constants.asm index 1db3e75..a37d8cb 100755 --- a/constants/name_constants.asm +++ b/constants/name_constants.asm @@ -1,2 +1,2 @@ ; Name Lists -ITEM_NAME EQU 4
\ No newline at end of file +ITEM_NAME EQU 4 diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 5dc3e8d..a656e7a 100755 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -15,4 +15,3 @@ SCRIPT_FINISHED_F EQU 7 SCRIPT_FINISHED_MASK EQU 1 << SCRIPT_FINISHED_F SCRIPT_SUCCESS EQU $f SCRIPT_FAIL EQU 0 - |