diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 22:56:36 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 22:56:36 -0500 |
| commit | 5c28d05bb40b47f084a34eb732da92c899e18db6 (patch) | |
| tree | b7e427bbb988bfdc51e347a87f6ab663c1f45a7b /data | |
| parent | 8e1e583640fcb82cb8d6327a0174a892b4ba0ad2 (diff) | |
| parent | 2c789b64b1bfa9ec33d805d06ad3a7141e3871f1 (diff) | |
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
# Conflicts:
# data/items/descriptions.asm
# data/sprite_anims/framesets.asm
# engine/crystal_colors.asm
# engine/events/kurt.asm
# engine/events/special.asm
# engine/events/std_scripts.asm
# engine/events_3.asm
# engine/item_effects.asm
# engine/namingscreen.asm
# engine/scripting.asm
# engine/stats_screen.asm
# engine/trade_animation.asm
# home/audio.asm
# main.asm
# maps/BattleTower1F.asm
# maps/BattleTowerBattleRoom.asm
# maps/BurnedTowerB1F.asm
# maps/ElmsLab.asm
# maps/GoldenrodDeptStore5F.asm
# maps/GoldenrodUnderground.asm
# maps/HallOfFame.asm
# maps/MahoganyTown.asm
# maps/ManiasHouse.asm
# maps/MobileBattleRoom.asm
# maps/MobileTradeRoomMobile.asm
# maps/RadioTower2F.asm
# maps/Route35NationalParkGate.asm
# maps/Route36NationalParkGate.asm
# maps/Route39Farmhouse.asm
# tilesets/palette_maps.asm
Diffstat (limited to 'data')
| -rwxr-xr-x | data/unknown_table.asm | 13 | ||||
| -rw-r--r-- | data/unused_text/dakutens.asm | 4 | ||||
| -rw-r--r-- | data/unused_text/gen_1_trainers.asm | 3 |
3 files changed, 16 insertions, 4 deletions
diff --git a/data/unknown_table.asm b/data/unknown_table.asm new file mode 100755 index 000000000..026ec5275 --- /dev/null +++ b/data/unknown_table.asm @@ -0,0 +1,13 @@ +Unreferenced_53d84: + db $1a, $15 + db $33, $16 + db $4b, $17 + db $62, $18 + db $79, $19 + db $90, $1a + db $a8, $1b + db $c4, $1c + db $e0, $1d + db $f6, $1e + db $ff, $1f + db $ff, $20 diff --git a/data/unused_text/dakutens.asm b/data/unused_text/dakutens.asm index 38792c937..82e884fdf 100644 --- a/data/unused_text/dakutens.asm +++ b/data/unused_text/dakutens.asm @@ -1,4 +1,4 @@ -Dakutens: ; dummied out +Dakutens: ; unused db "かが", "きぎ", "くぐ", "けげ", "こご" db "さざ", "しじ", "すず", "せぜ", "そぞ" db "ただ", "ちぢ", "つづ", "てで", "とど" @@ -9,7 +9,7 @@ Dakutens: ; dummied out db "ハバ", "ヒビ", "フブ", "へべ", "ホボ" db -1 ; end -Handakutens: ; dummied out +Handakutens: ; unused db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ" db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ" db -1 ; end diff --git a/data/unused_text/gen_1_trainers.asm b/data/unused_text/gen_1_trainers.asm index 9a637d6a2..e7e985f84 100644 --- a/data/unused_text/gen_1_trainers.asm +++ b/data/unused_text/gen_1_trainers.asm @@ -1,5 +1,4 @@ -GetGen1TrainerClassName: ; 50a28 -; XXX +Unreferenced_GetGen1TrainerClassName: ; 50a28 ld hl, .Strings ld a, [TrainerClass] dec a |