summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/cable_car.s102
-rw-r--r--data/easy_chat.s477
-rw-r--r--data/scripts/maps/MtChimney_CableCarStation.inc2
-rw-r--r--data/scripts/maps/Route112_CableCarStation.inc2
-rw-r--r--data/specials.inc2
5 files changed, 3 insertions, 582 deletions
diff --git a/data/cable_car.s b/data/cable_car.s
deleted file mode 100644
index 775e53b6a..000000000
--- a/data/cable_car.s
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "constants/map_objects.h"
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gCableCarMtChimneyTilemap:: @ 8401820
- .incbin "graphics/misc/cable_car_mt_chimney_map.bin.lz"
-
- .align 2
-gCableCarTreeTilemap:: @ 8401978
- .incbin "graphics/misc/cable_car_tree_map.bin.lz"
-
- .align 2
-gCableCarMountainTilemap:: @ 8401AFC
- .incbin "graphics/misc/cable_car_mountain_map.bin.lz"
-
- .align 2
-gCableCarPylonHookTilemapEntries:: @ 8401CC0
- .2byte 0x3000
- .2byte 0x3001
- .2byte 0x3002
- .2byte 0x3003
- .2byte 0x3004
- .2byte 0x3005
- .2byte 0x3006
- .2byte 0x3007
- .2byte 0x3008
- .2byte 0x3009
-
- .align 2
-gCableCarPylonStemTilemap:: @ 8401CD4
- .incbin "graphics/misc/cable_car_pylon_stem_map.bin.lz"
-
- .align 2
-gUnknown_08401CF8:: @ 8401CF8
- obj_tiles gCableCar_Gfx, 0x800, 1
- obj_tiles gCableCarDoor_Gfx, 0x40, 2
- obj_tiles gCableCarCord_Gfx, 0x80, 3
- .space 8
-
- .align 2
-gUnknown_08401D18:: @ 8401D18
- obj_pal gCableCar_Pal, 1
- .space 8
-
- .align 2
-gOamData_8401D28:: @ 8401D28
- .2byte 0x0300
- .2byte 0xC000
- .2byte 0x0800
-
- .align 2
-gOamData_8401D30:: @ 8401D30
- .2byte 0x4300
- .2byte 0x0000
- .2byte 0x0800
-
- .align 2
-gOamData_8401D38:: @ 8401D38
- .2byte 0x0300
- .2byte 0x4000
- .2byte 0x0800
-
- .align 2
-gSpriteTemplate_8401D40:: @ 8401D40
- spr_template 1, 1, gOamData_8401D28, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8123CB8
-
- .align 2
-gSpriteTemplate_8401D58:: @ 8401D58
- spr_template 2, 1, gOamData_8401D30, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8123CB8
-
- .align 2
-gSpriteTemplate_8401D70:: @ 8401D70
- spr_template 3, 1, gOamData_8401D38, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, nullsub_76
-
-gCableCarPlayerGraphicsIDs:: @ 8401D88
- .byte MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
- .byte MAP_OBJ_GFX_RIVAL_MAY_NORMAL
-
-gMtChimneyHikerGraphicsIDs:: @ 8401D8A
- .byte MAP_OBJ_GFX_HIKER
- .byte MAP_OBJ_GFX_CAMPER
- .byte MAP_OBJ_GFX_PICNICKER
- .byte MAP_OBJ_GFX_POOCHYENA @ not used
-
- .align 1
-gMtChimneyHikerCoords:: @ 8401D8E
- .2byte 0, 80
- .2byte 240, 146
-
-gMtChimneyHikerMovementDelayTable:: @ 8401D96
- .byte 0
- .byte 60
- .byte 120
- .byte 170
-
- .align 2
-gUnknown_08401D9C:: @ 8401D9C
- .4byte sub_8123EB8
- .4byte sub_8123F44
diff --git a/data/easy_chat.s b/data/easy_chat.s
index 99a03f8f5..d41ffccce 100644
--- a/data/easy_chat.s
+++ b/data/easy_chat.s
@@ -8,483 +8,6 @@
.section .rodata
- .align 1
-gMysteryEventPhrase:: @ 83DB678
- .2byte EC_WORD_MYSTERY
- .2byte EC_WORD_EVENT
- .2byte EC_WORD_IS
- .2byte EC_WORD_EXCITING
-
- .align 1
-gBerryMasterWifePhrases:: @ 83DB680
-.ifdef ENGLISH
- .2byte EC_WORD_GREAT
- .2byte EC_WORD_BATTLE
-
- .2byte EC_WORD_CHALLENGE
- .2byte EC_WORD_CONTEST
-
- .2byte EC_WORD_OVERWHELMING
- .2byte EC_POKEMON(LATIAS)
-
- .2byte EC_WORD_COOL
- .2byte EC_POKEMON(LATIOS)
-
- .2byte EC_WORD_SUPER
- .2byte EC_WORD_HUSTLE
-.else
- .2byte EC_WORD_GREAT
- .2byte EC_WORD_FIGHT
-
- .2byte EC_WORD_CONTEST
- .2byte EC_WORD_CHALLENGE
-
- .2byte EC_POKEMON(LATIAS)
- .2byte EC_WORD_OVERWHELMING
-
- .2byte EC_POKEMON(LATIOS)
- .2byte EC_WORD_COOL
-
- .2byte EC_WORD_SUPER
- .2byte 0xFFFF
-.endif
-
-gUnknown_083DB694:: @ 83DB694
- .4byte gSharedMem + 0x1000
-
- .align 2
-gUnknown_083DB698:: @ 83DB698
- .4byte REG_BG3VOFS
- .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
- .4byte 1
-
-gUnknown_083DB6A4:: @ 83DB6A4
- .byte 4
- .byte 0
- .byte 0
- .byte 0
- .byte 1
- .byte 5
- .byte 0
- .byte 2
- .byte 2
- .byte 3
- .byte 2
- .byte 2
- .byte 2
- .byte 3
-
-gUnknown_083DB6B2:: @ 83DB6B2
- .string "ABCDEF $ "
- .string "GHIJKL$ "
- .string "MNOPQRS$ "
- .string "TUVWXYZ$ "
-
- .align 2
-gUnknown_083DB6F4:: @ 83DB6F4
- .4byte OtherText_MakeProfilePage1, OtherText_MakeProfilePage2, 0x1
- .4byte OtherText_MakeMessagePage1, OtherText_MakeMessagePage2, 0x1
- .4byte OtherText_CombineNinePhrasesPage1, OtherText_CombineNinePhrasesPage2, 0x1
- .4byte OtherText_DescribeFeelingsPage1, OtherText_DescribeFeelingsPage2, 0x1
- .4byte OtherText_ImproveBardSongPage1, OtherText_ImproveBardSongPage2, 0x1
- .4byte OtherText_CombineTwoPhrasesPage1, OtherText_CombineTwoPhrasesPage2, 0x1
- .4byte OtherText_YourProfile, OtherText_ConfirmTrendyPage2, 0x0
- .4byte OtherText_YourFeelingBattle, OtherText_ConfirmTrendyPage2, 0x1
- .4byte OtherText_SetWinMessage, OtherText_ConfirmTrendyPage2, 0x1
- .4byte OtherText_SetLossMessage, OtherText_ConfirmTrendyPage2, 0x1
- .4byte OtherText_MailMessage, OtherText_ConfirmTrendyPage2, 0x1
- .4byte OtherText_MailSalutation, OtherText_ConfirmTrendyPage2, 0x1
- .4byte OtherText_NewSong, OtherText_ConfirmTrendyPage2, 0x0
- .4byte OtherText_TheAnswer, OtherText_ConfirmTrendyPage2, 0x0
- .4byte OtherText_ConfirmTrendyPage1, OtherText_ConfirmTrendyPage2, 0x1
- .4byte OtherText_HipsterPage1, OtherText_HipsterPage2, 0x1
- .4byte OtherText_WithFourPhrases, OtherText_CombineNinePhrasesPage2, 0x1
-
-gUnknown_083DB7C0:: @ 83DB7C0
- .byte 0, 6
- .byte 1, 7
- .byte 1, 8
- .byte 1, 9
- .byte 2, 10
- .byte 16, 13
- .byte 4, 12
- .byte 3, 13
- .byte 3, 13
- .byte 5, 14
- .byte 3, 13
- .byte 3, 13
- .byte 3, 13
- .byte 15, 13
-
- .align 2
-gUnknown_083DB7DC:: @ 83DB7DC
-.ifdef ENGLISH
- .4byte gSharedMem + 0xAC80
- .4byte gSharedMem + 0xACC9
- .4byte gSharedMem + 0xAD12
- .4byte gSharedMem + 0xAD5B
-.else
- .4byte gSharedMem + 0xAFAC
- .4byte gSharedMem + 0xAFF5
- .4byte gSharedMem + 0xB03E
- .4byte gSharedMem + 0xB087
-.endif
-
- .align 1
-gUnknown_083DB7EC:: @ 83DB7EC
-.ifdef ENGLISH
- .2byte EC_WORD_I_AM
- .2byte EC_WORD_A
- .2byte EC_WORD_POKEMON
- .2byte EC_WORD_GREAT
-.else
- .2byte EC_WORD_I_AM
- .2byte EC_WORD_BIG
- .2byte EC_WORD_IN
- .2byte EC_WORD_POKEMON
-.endif
-
- .align 1
-gUnknown_083DB7F4:: @ 83DB7F4
- .2byte EC_WORD_ARE
- .2byte EC_WORD_YOU
- .2byte EC_WORD_READY
- .2byte EC_WORD_QUES
- .2byte EC_WORD_HERE_I_COME
- .2byte EC_WORD_EXCL
-
- .align 2
-InterviewPalette_0:: @ 83DB800
- .incbin "graphics/misc/interview_pal0.gbapal"
-
- .align 2
-InterviewPalette_1:: @ 83DB820
- .incbin "graphics/misc/interview_pal1.gbapal"
-
- .align 2
-InterviewArrowTiles: @ 83DB840
- .incbin "graphics/misc/interview_arrow.4bpp"
-
- .align 2
-InterviewButtonTiles: @ 83DB940
- .incbin "graphics/misc/interview_buttons.4bpp"
-
- .align 2
-gMenuInterviewFrame_Pal::
- .incbin "graphics/misc/interview_frame.gbapal"
-
- .align 2
-gMenuInterviewFrame_Gfx::
- .incbin "graphics/misc/interview_frame.4bpp.lz"
-
- .align 2
-InterviewTriangleCursorTiles: @ 83DBB94
- .incbin "graphics/misc/interview_triangle_cursor.4bpp"
-
- .align 2
-gSpriteSheets_Interview:: @ 83DBBB4
- obj_tiles InterviewTriangleCursorTiles, 0x20, 0
- obj_tiles gInterviewOutlineCursorTiles, 0x700, 1
- obj_tiles InterviewArrowTiles, 0x100, 2
- obj_tiles InterviewButtonTiles, 0x100, 3
- null_obj_tiles
-
- .align 2
-gSpritePalettes_Interview:: @ 83DBBDC
- obj_pal InterviewPalette_0, 0
- obj_pal InterviewPalette_1, 1
- null_obj_pal
-
- .align 2
-gOamData_83DBBF4:: @ 83DBBF4
- .2byte 0x0000
- .2byte 0x0000
- .2byte 0x0000
-
- .align 2
-gSpriteTemplate_83DBBFC:: @ 83DBBFC
- spr_template 0, 0, gOamData_83DBBF4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E82BC
-
- .align 2
-gOamData_83DBC14:: @ 83DBC14
- .2byte 0x4400
- .2byte 0x8000
- .2byte 0x0400
-
- .align 2
-gSpriteAnim_83DBC1C:: @ 83DBC1C
- obj_image_anim_frame 0, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBC24:: @ 83DBC24
-.ifdef ENGLISH
- obj_image_anim_frame 8, 5
-.else
- obj_image_anim_frame 0, 5
-.endif
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBC2C:: @ 83DBC2C
- obj_image_anim_frame 0, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBC34:: @ 83DBC34
- obj_image_anim_frame 24, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBC3C:: @ 83DBC3C
- obj_image_anim_frame 32, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBC44:: @ 83DBC44
- obj_image_anim_frame 40, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBC4C:: @ 83DBC4C
- obj_image_anim_frame 40, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBC54:: @ 83DBC54
- obj_image_anim_frame 40, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBC5C:: @ 83DBC5C
- obj_image_anim_frame 48, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBC64:: @ 83DBC64
-.ifdef ENGLISH
- obj_image_anim_frame 40, 5
-.else
- obj_image_anim_frame 16, 5
-.endif
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBC6C:: @ 83DBC6C
- obj_image_anim_frame 48, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBC74:: @ 83DBC74
- obj_image_anim_frame 40, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnimTable_83DBC7C:: @ 83DBC7C
- .4byte gSpriteAnim_83DBC1C
- .4byte gSpriteAnim_83DBC24
- .4byte gSpriteAnim_83DBC2C
- .4byte gSpriteAnim_83DBC34
-
- .align 2
-gSpriteAnimTable_83DBC8C:: @ 83DBC8C
- .4byte gSpriteAnim_83DBC3C
- .4byte gSpriteAnim_83DBC44
- .4byte gSpriteAnim_83DBC4C
- .4byte gSpriteAnim_83DBC54
-
- .align 2
-gSpriteAnimTable_83DBC9C:: @ 83DBC9C
- .4byte gSpriteAnim_83DBC5C
- .4byte gSpriteAnim_83DBC64
- .4byte gSpriteAnim_83DBC6C
- .4byte gSpriteAnim_83DBC74
-
- .align 2
-gSpriteTemplate_83DBCAC:: @ 83DBCAC
- spr_template 1, 1, gOamData_83DBC14, gSpriteAnimTable_83DBC7C, NULL, gDummySpriteAffineAnimTable, sub_80E85F8
-
- .align 2
-gUnknown_083DBCC4:: @ 83DBCC4
- .byte 1, 3, 5, 8, 10, 12, 15
- .byte 1, 3, 5, 8, 10, 12, 0
- .byte 1, 3, 5, 8, 10, 12, 14
- .byte 1, 3, 5, 8, 10, 12, 14
-
- .align 2
-gOamData_83DBCE0:: @ 83DBCE0
- .2byte 0x0000
- .2byte 0x4000
- .2byte 0x0400
-
- .align 2
-gSpriteAnim_83DBCE8:: @ 83DBCE8
- obj_image_anim_frame 0, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBCF0:: @ 83DBCF0
- obj_image_anim_frame 4, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnimTable_83DBCF8:: @ 83DBCF8
- .4byte gSpriteAnim_83DBCE8
- .4byte gSpriteAnim_83DBCF0
-
- .align 2
-gSpriteAnim_83DBD00:: @ 83DBD00
- obj_image_anim_frame 0, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBD08:: @ 83DBD08
- obj_image_anim_frame 4, 5
- obj_image_anim_end
-
- .align 2
-gSpriteAnimTable_83DBD10:: @ 83DBD10
- .4byte gSpriteAnim_83DBD00
- .4byte gSpriteAnim_83DBD08
-
- .align 2
-gSpriteTemplate_83DBD18:: @ 83DBD18
- spr_template 2, 0, gOamData_83DBCE0, gSpriteAnimTable_83DBCF8, NULL, gDummySpriteAffineAnimTable, sub_80E8B78
-
- .align 2
-gUnknown_083DBD30:: @ 83DBD30
- obj_tiles gMenuInterviewFrame_Gfx, 2048, 0x0006
-
- .align 2
-gUnknown_083DBD38:: @ 83DBD38
- obj_pal gMenuInterviewFrame_Pal, 0x0004
-
- .align 2
-gOamData_83DBD40:: @ 83DBD40
- .2byte 0x0000
- .2byte 0xC000
- .2byte 0x0000
-
- .align 2
-gSpriteTemplate_83DBD48:: @ 83DBD48
- spr_template 6, 4, gOamData_83DBD40, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
- .align 2
-gUnknown_083DBD60:: @ 83DBD60
- obj_tiles gMenuWordGroupIndicator_Gfx, 4096, 0x0007
-
- .align 2
-gUnknown_083DBD68:: @ 83DBD68
- obj_pal gMenuWordGroupIndicator_Pal, 0x0005
-
- .align 2
-gOamData_83DBD70:: @ 83DBD70
- .2byte 0x4000
- .2byte 0xC000
- .2byte 0x0000
-
- .align 2
-gSpriteAnim_83DBD78:: @ 83DBD78
- obj_image_anim_frame 96, 3
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBD80:: @ 83DBD80
- obj_image_anim_frame 64, 4
- obj_image_anim_frame 96, 4
- obj_image_anim_frame 64, 4
- obj_image_anim_frame 0, 4
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBD94:: @ 83DBD94
- obj_image_anim_frame 64, 4
- obj_image_anim_frame 96, 4
- obj_image_anim_frame 64, 4
- obj_image_anim_frame 32, 4
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBDA8:: @ 83DBDA8
- obj_image_anim_frame 64, 2
- obj_image_anim_frame 32, 2
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBDB4:: @ 83DBDB4
- obj_image_anim_frame 64, 2
- obj_image_anim_frame 0, 2
- obj_image_anim_end
-
- .align 2
-gSpriteAnim_83DBDC0:: @ 83DBDC0
- obj_image_anim_frame 64, 2
- obj_image_anim_frame 96, 2
- obj_image_anim_end
-
- .align 2
-gSpriteAnimTable_83DBDCC:: @ 83DBDCC
- .4byte gSpriteAnim_83DBD78
- .4byte gSpriteAnim_83DBD80
- .4byte gSpriteAnim_83DBD94
- .4byte gSpriteAnim_83DBDA8
- .4byte gSpriteAnim_83DBDB4
- .4byte gSpriteAnim_83DBDC0
-
- .align 2
-gSpriteTemplate_83DBDE4:: @ 83DBDE4
- spr_template 7, 5, gOamData_83DBD70, gSpriteAnimTable_83DBDCC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_083DBDFC:: @ 83DBDFC
- .incbin "graphics/unknown/unknown_3DBDFC.gbapal"
-
- .align 1
-gUnknown_083DBE1C:: @ 83DBE1C
- .2byte 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300
- .2byte 0x301, 0x301, 0x301, 0x301, 0x301, 0x300, 0x300, 0x300, 0x300
-
-gUnknown_083DBE40:: @ 83DBE40
- .incbin "graphics/unknown/unknown_3DBE40.gbapal"
-
-@ unused tilemap?
- .2byte 0x5036, 0x5037, 0x5038, 0x5039, 0x503A, 0x503B
- .2byte 0x5046, 0x5047, 0x5048, 0x5049, 0x504A, 0x504B
- .2byte 0x5056, 0x5057, 0x5058, 0x5059, 0x505A, 0x505B
- .2byte 0x5030, 0x5031, 0x5032, 0x5033, 0x5034, 0x5035
- .2byte 0x5040, 0x5041, 0x5042, 0x5043, 0x5044, 0x5045
- .2byte 0x5050, 0x5051, 0x5052, 0x5053, 0x5054, 0x5055
-
-gUnknown_083DBEA8:: @ 83DBEA8
- .string "{CLEAR_TO 88}$"
-
-.ifdef GERMAN
-unk_83E7EB0:
- .string "{UNKNOWN_14 8} A B C D E F {UNKNOWN_14 0}"
-unk_83E7EC5:
- .string "mehr$"
-unk_83E7ECA::
- .string "{UNKNOWN_14 8} G H I J K L $"
-unk_83E7EE1:
- .string "{UNKNOWN_14 8} M N O P Q R S $"
-unk_83E7EF8:
- .string "{UNKNOWN_14 8} T U V W X Y Z $"
-.endif
-
- .align 2
-gUnknown_083DBEAC:: @ 83DBEAC
-.ifdef ENGLISH
- .string "{UNKNOWN_14 8} A B C D E F {UNKNOWN_14 0}others$", 0x20
- .string "{UNKNOWN_14 8} G H I J K L $", 0x20
- .string "{UNKNOWN_14 8} M N O P Q R S $", 0x20
- .string "{UNKNOWN_14 8} T U V W X Y Z $", 0x20
-.else
- .4byte unk_83E7EB0
- .4byte unk_83E7ECA
- .4byte unk_83E7EE1
- .4byte unk_83E7EF8
- .4byte unk_83E7EC5
-.endif
-
@ 83DBF2C
.include "data/text/easy_chat/group_words.inc"
diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc
index aefc68bda..6b0858bc5 100644
--- a/data/scripts/maps/MtChimney_CableCarStation.inc
+++ b/data/scripts/maps/MtChimney_CableCarStation.inc
@@ -48,7 +48,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C
setvar VAR_CABLE_CAR_STATION_STATE, 2
incrementgamestat GAME_STAT_RODE_CABLE_CAR
special CableCarWarp
- special sub_8123218
+ special CableCar
waitstate
release
end
diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc
index adbea780e..0264342ea 100644
--- a/data/scripts/maps/Route112_CableCarStation.inc
+++ b/data/scripts/maps/Route112_CableCarStation.inc
@@ -49,7 +49,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD
setvar VAR_CABLE_CAR_STATION_STATE, 1
incrementgamestat GAME_STAT_RODE_CABLE_CAR
special CableCarWarp
- special sub_8123218
+ special CableCar
waitstate
release
end
diff --git a/data/specials.inc b/data/specials.inc
index 032a3884c..6904a2b6b 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -159,7 +159,7 @@ gSpecials::
def_special GetRivalSonDaughterString
def_special SetFlagInVar
def_special CableCarWarp
- def_special sub_8123218
+ def_special CableCar
def_special Overworld_PlaySpecialMapMusic
def_special StartWallClock
def_special ScrSpecial_ViewWallClock
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 02:45:36 +0000