diff options
| author | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
| commit | 6cb885a9f68b9f445d7fa45279731336fe0247d4 (patch) | |
| tree | 39736ab1dd8ebcc57f8e981db6103285743d5530 /data | |
| parent | Identify unnamed functions in map_sprites.asm (#126) (diff) | |
| parent | Fix some label typos, and add some constants instead of raw numbers (#492) (diff) | |
| download | pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.gz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.xz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/objects/Route3.asm | 2 | ||||
| -rw-r--r-- | data/maps/objects/TradeCenter.asm | 2 | ||||
| -rw-r--r-- | data/moves/moves.asm | 2 | ||||
| -rw-r--r-- | data/predef_pointers.asm | 2 | ||||
| -rw-r--r-- | data/sgb/sgb_palettes.asm | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/objects/Route3.asm b/data/maps/objects/Route3.asm index ce7224b5..6f491468 100644 --- a/data/maps/objects/Route3.asm +++ b/data/maps/objects/Route3.asm @@ -15,7 +15,7 @@ Route3_Object: def_warp_events def_bg_events - bg_event 59, 9, 10 ; Route3SignText + bg_event 59, 9, TEXT_ROUTE3_SIGN def_object_events object_event 57, 11, SPRITE_SUPER_NERD, STAY, NONE, TEXT_ROUTE3_SUPER_NERD diff --git a/data/maps/objects/TradeCenter.asm b/data/maps/objects/TradeCenter.asm index 74613f9a..cfa1fe0b 100644 --- a/data/maps/objects/TradeCenter.asm +++ b/data/maps/objects/TradeCenter.asm @@ -9,6 +9,6 @@ TradeCenter_Object: def_bg_events def_object_events - object_event 2, 2, SPRITE_RED, STAY, 0, TEXT_TRADECENTER_OPPONENT + object_event 2, 2, SPRITE_RED, STAY, ANY_DIR, TEXT_TRADECENTER_OPPONENT def_warps_to TRADE_CENTER diff --git a/data/moves/moves.asm b/data/moves/moves.asm index f435ab6b..ac638721 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -5,7 +5,7 @@ MACRO move db \4 ; type db \5 percent ; accuracy db \6 ; pp - assert \6 <= 40, "PP must be 40 or less" + ASSERT \6 <= 40, "PP must be 40 or less" ENDM Moves: diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm index e960d49b..ebf81847 100644 --- a/data/predef_pointers.asm +++ b/data/predef_pointers.asm @@ -61,7 +61,7 @@ PredefPointers:: add_predef BattleTransition add_predef CopyTileIDsFromList add_predef PlayIntro - add_predef GetMoveSoundB + add_predef GetIntroMoveSound add_predef FlashScreen add_predef GetTileAndCoordsInFrontOfPlayer add_predef StatusScreen diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm index 4f70558e..2c7537d0 100644 --- a/data/sgb/sgb_palettes.asm +++ b/data/sgb/sgb_palettes.asm @@ -43,7 +43,7 @@ SuperPalettes: RGB 31,31,30, 16,16,16, 31,25,09, 06,06,06 ; PAL_PIKACHUS_BEACH_TITLE assert_table_length NUM_SGB_PALS -GBCBasePalettes: +CGBBasePalettes: ; entries correspond to PAL_* constants table_width 2 * 4 RGB 31,31,31, 16,31,04, 11,23,31, 03,03,03 ; PAL_ROUTE |