diff options
| -rw-r--r-- | data/battle_tower.s | 123 | ||||
| -rw-r--r-- | data/learn_move.s | 3 |
2 files changed, 118 insertions, 8 deletions
diff --git a/data/battle_tower.s b/data/battle_tower.s index e5c31be36..a45dcf72c 100644 --- a/data/battle_tower.s +++ b/data/battle_tower.s @@ -16,16 +16,112 @@ .include "data/battle_tower/level_100_mons.inc" gUnknown_08405E60:: @ 8405E60 - .incbin "baserom.gba", 0x00405e60, 0x1e + .byte 4 + .byte 7 + .byte 8 + .byte 13 + .byte 14 + .byte 15 + .byte 16 + .byte 17 + .byte 18 + .byte 19 + .byte 20 + .byte 21 + .byte 23 + .byte 29 + .byte 32 + .byte 34 + .byte 36 + .byte 38 + .byte 39 + .byte 41 + .byte 43 + .byte 45 + .byte 46 + .byte 47 + .byte 53 + .byte 56 + .byte 64 + .byte 66 + .byte 72 + .byte 73 gUnknown_08405E7E:: @ 8405E7E - .incbin "baserom.gba", 0x00405e7e, 0x14 + .byte 3 + .byte 6 + .byte 9 + .byte 10 + .byte 11 + .byte 12 + .byte 22 + .byte 30 + .byte 33 + .byte 35 + .byte 40 + .byte 42 + .byte 44 + .byte 48 + .byte 49 + .byte 50 + .byte 51 + .byte 65 + .byte 67 + .byte 71 gUnknown_08405E92:: @ 8405E92 - .incbin "baserom.gba", 0x00405e92, 0x1e + .byte MAP_OBJ_GFX_HIKER + .byte MAP_OBJ_GFX_TUBER_M + .byte MAP_OBJ_GFX_MAN_4 + .byte MAP_OBJ_GFX_BOY_4 + .byte MAP_OBJ_GFX_MANIAC + .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_M + .byte MAP_OBJ_GFX_BLACK_BELT + .byte MAP_OBJ_GFX_MAN_6 + .byte MAP_OBJ_GFX_MAN_6 + .byte MAP_OBJ_GFX_CAMPER + .byte MAP_OBJ_GFX_MANIAC + .byte MAP_OBJ_GFX_PSYCHIC_M + .byte MAP_OBJ_GFX_GENTLEMAN + .byte MAP_OBJ_GFX_SCHOOL_KID_M + .byte MAP_OBJ_GFX_MAN_3 + .byte MAP_OBJ_GFX_OLD_MAN_1 + .byte MAP_OBJ_GFX_YOUNGSTER + .byte MAP_OBJ_GFX_FISHERMAN + .byte MAP_OBJ_GFX_CYCLING_TRIATHLETE_M + .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_M + .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_M + .byte MAP_OBJ_GFX_MAN_4 + .byte MAP_OBJ_GFX_MAN_6 + .byte MAP_OBJ_GFX_LITTLE_BOY_1 + .byte MAP_OBJ_GFX_SAILOR + .byte MAP_OBJ_GFX_MANIAC + .byte MAP_OBJ_GFX_MAN_5 + .byte MAP_OBJ_GFX_CAMPER + .byte MAP_OBJ_GFX_BUG_CATCHER + .byte MAP_OBJ_GFX_HIKER gUnknown_08405EB0:: @ 8405EB0 - .incbin "baserom.gba", 0x00405eb0, 0x14 + .byte MAP_OBJ_GFX_WOMAN_3 + .byte MAP_OBJ_GFX_TUBER_F + .byte MAP_OBJ_GFX_WOMAN_7 + .byte MAP_OBJ_GFX_WOMAN_1 + .byte MAP_OBJ_GFX_WOMAN_3 + .byte MAP_OBJ_GFX_BEAUTY + .byte MAP_OBJ_GFX_LASS + .byte MAP_OBJ_GFX_GIRL_3 + .byte MAP_OBJ_GFX_WOMAN_2 + .byte MAP_OBJ_GFX_OLD_WOMAN_1 + .byte MAP_OBJ_GFX_CYCLING_TRIATHLETE_F + .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_F + .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_F + .byte MAP_OBJ_GFX_GIRL_3 + .byte MAP_OBJ_GFX_WOMAN_7 + .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_F + .byte MAP_OBJ_GFX_PICNICKER + .byte MAP_OBJ_GFX_WOMAN_3 + .byte MAP_OBJ_GFX_PICNICKER + .byte MAP_OBJ_GFX_LASS .align 1 gBattleTowerBanlist:: @ 8405EC4 @@ -41,8 +137,23 @@ gBattleTowerBanlist:: @ 8405EC4 .2byte SPECIES_DEOXYS .2byte -1 + .align 1 gUnknown_08405EDA:: @ 8405EDA - .incbin "baserom.gba", 0x00405eda, 0xc + .2byte ITEM_HP_UP + .2byte ITEM_PROTEIN + .2byte ITEM_IRON + .2byte ITEM_CALCIUM + .2byte ITEM_CARBOS + .2byte ITEM_ZINC + .align 1 gUnknown_08405EE6:: @ 8405EE6 - .incbin "baserom.gba", 0x00405ee6, 0x12 + .2byte ITEM_BRIGHT_POWDER + .2byte ITEM_WHITE_HERB + .2byte ITEM_QUICK_CLAW + .2byte ITEM_LEFTOVERS + .2byte ITEM_MENTAL_HERB + .2byte ITEM_KINGS_ROCK + .2byte ITEM_FOCUS_BAND + .2byte ITEM_SCOPE_LENS + .2byte ITEM_CHOICE_BAND diff --git a/data/learn_move.s b/data/learn_move.s index 29c44521f..369fbfdf0 100644 --- a/data/learn_move.s +++ b/data/learn_move.s @@ -132,8 +132,7 @@ gSpriteAnimTable_8402DF8:: @ 8402DF8 gSpriteTemplate_8402E08:: @ 8402E08 spr_template 5525, 5526, gOamData_8402D50, gSpriteAnimTable_8402DF8, NULL, gDummySpriteAffineAnimTable, sub_8133300 - .align 2 - .incbin "baserom.gba", 0x00402e20, 0x4 @ あきと ? + .string "あきと$" @ programmer Akito Mori? gUnknown_08402E24:: @ 8402E24 .byte 11, 1, 1 |