mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-26 03:34:15 +01:00
Continue decompiling field_specials
This commit is contained in:
Diegoisawesome
parent
90896e38c9
commit
bad170b0cb
@ -11843,7 +11843,7 @@ sub_81A0784: @ 81A0784
|
||||
movs r1, 0
|
||||
adds r2, r4, 0
|
||||
adds r3, r5, 0
|
||||
bl sub_8198A50
|
||||
bl CreateWindowTemplate
|
||||
ldr r0, [sp, 0x10]
|
||||
ldr r1, [sp, 0x14]
|
||||
str r0, [sp, 0x18]
|
||||
|
||||
1301
asm/field_specials.s
1301
asm/field_specials.s
File diff suppressed because it is too large
Load Diff
@ -1498,7 +1498,7 @@ CreateWindowFromRect: @ 80E2A1C
|
||||
movs r1, 0
|
||||
adds r2, r4, 0
|
||||
adds r3, r5, 0
|
||||
bl sub_8198A50
|
||||
bl CreateWindowTemplate
|
||||
ldr r0, [sp, 0x10]
|
||||
ldr r1, [sp, 0x14]
|
||||
str r0, [sp, 0x18]
|
||||
|
||||
@ -3,311 +3,6 @@
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gUnknown_085B2BAC:: @ 85B2BAC
|
||||
.byte 0x00, 0x15, 0x01, 0x08, 0x04, 0x0f, 0x08, 0x00
|
||||
|
||||
.align 2
|
||||
gElevatorFloorsTable:: @ 85B2BB4
|
||||
.4byte gText_B4F
|
||||
.4byte gText_B3F
|
||||
.4byte gText_B2F
|
||||
.4byte gText_B1F
|
||||
.4byte gText_1F
|
||||
.4byte gText_2F
|
||||
.4byte gText_3F
|
||||
.4byte gText_4F
|
||||
.4byte gText_5F
|
||||
.4byte gText_6F
|
||||
.4byte gText_7F
|
||||
.4byte gText_8F
|
||||
.4byte gText_9F
|
||||
.4byte gText_10F
|
||||
.4byte gText_11F
|
||||
.4byte gText_Rooftop
|
||||
|
||||
.align 1
|
||||
gUnknown_085B2BF4:: @ 85B2BF4
|
||||
.2byte 0x0329, 0x032a, 0x032b, 0x0331, 0x0332, 0x0333, 0x0339, 0x033a, 0x033b
|
||||
|
||||
.align 1
|
||||
gUnknown_085B2C06:: @ 85B2C06
|
||||
.2byte 0x0329, 0x032b, 0x032a, 0x0331, 0x0333, 0x0332, 0x0339, 0x033b, 0x033a
|
||||
|
||||
gUnknown_085B2C18:: @ 85B2C18
|
||||
.byte 0x08, 0x10, 0x18, 0x20, 0x26, 0x2e, 0x34, 0x38, 0x39
|
||||
|
||||
gUnknown_085B2C21:: @ 85B2C21
|
||||
.byte 0x03, 0x06, 0x09, 0x0c, 0x0f, 0x12, 0x15, 0x18, 0x1b
|
||||
|
||||
.align 1
|
||||
gUnknown_085B2C2A:: @ 85B2C2A
|
||||
.2byte 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a
|
||||
.2byte 0x1a35, 0x193c, 0xffff
|
||||
|
||||
.align 2
|
||||
gUnknown_085B2C50:: @ 85B2C50
|
||||
.4byte BattleFrontier_Lounge2_Text_260971
|
||||
.4byte BattleFrontier_Lounge2_Text_260A1E
|
||||
.4byte BattleFrontier_Lounge2_Text_260AE7
|
||||
.4byte BattleFrontier_Lounge2_Text_2619AC
|
||||
.4byte BattleFrontier_Lounge2_Text_261A91
|
||||
.4byte BattleFrontier_Lounge2_Text_261B0C
|
||||
.4byte BattleFrontier_Lounge2_Text_261B95
|
||||
.4byte BattleFrontier_Lounge2_Text_261B95
|
||||
.4byte BattleFrontier_Lounge2_Text_261B95
|
||||
.4byte BattleFrontier_Lounge2_Text_261C1A
|
||||
.4byte BattleFrontier_Lounge2_Text_261C1A
|
||||
.4byte BattleFrontier_Lounge2_Text_261C1A
|
||||
.4byte BattleFrontier_Lounge2_Text_260BC4
|
||||
.4byte BattleFrontier_Lounge2_Text_260C6D
|
||||
.4byte BattleFrontier_Lounge2_Text_260D3A
|
||||
.4byte BattleFrontier_Lounge2_Text_260E1E
|
||||
.4byte BattleFrontier_Lounge2_Text_260EC7
|
||||
.4byte BattleFrontier_Lounge2_Text_260F74
|
||||
.4byte BattleFrontier_Lounge2_Text_2614E6
|
||||
.4byte BattleFrontier_Lounge2_Text_261591
|
||||
.4byte BattleFrontier_Lounge2_Text_26166F
|
||||
.4byte BattleFrontier_Lounge2_Text_261282
|
||||
.4byte BattleFrontier_Lounge2_Text_261329
|
||||
.4byte BattleFrontier_Lounge2_Text_261403
|
||||
.4byte BattleFrontier_Lounge2_Text_261026
|
||||
.4byte BattleFrontier_Lounge2_Text_2610CC
|
||||
.4byte BattleFrontier_Lounge2_Text_261194
|
||||
.4byte BattleFrontier_Lounge2_Text_26174D
|
||||
.4byte BattleFrontier_Lounge2_Text_2617F9
|
||||
.4byte BattleFrontier_Lounge2_Text_2618C4
|
||||
|
||||
gUnknown_085B2CC8:: @ 85B2CC8
|
||||
.byte 0x15, 0x38, 0x15, 0x23, 0xff, 0xff, 0xff, 0xff, 0x02, 0x04, 0x07, 0x15, 0x07, 0x15, 0x0e, 0x1c, 0x0d, 0x70, 0x07, 0x38
|
||||
|
||||
.align 1
|
||||
gUnknown_085B2CDC:: @ 85B2CDC
|
||||
.2byte 0x0007, 0x000e, 0x0015, 0x001c, 0x0023, 0x0031, 0x003f, 0x004d, 0x005b, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_085B2CF0:: @ 85B2CF0
|
||||
.4byte gText_Exit
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
|
||||
.4byte gText_BlueFlute
|
||||
.4byte gText_YellowFlute
|
||||
.4byte gText_RedFlute
|
||||
.4byte gText_WhiteFlute
|
||||
.4byte gText_BlackFlute
|
||||
.4byte gText_PrettyChair
|
||||
.4byte gText_PrettyDesk
|
||||
.4byte gText_Exit
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
|
||||
.4byte gText_0Pts
|
||||
.4byte gText_10Pts
|
||||
.4byte gText_20Pts
|
||||
.4byte gText_30Pts
|
||||
.4byte gText_40Pts
|
||||
.4byte gText_50Pts
|
||||
.4byte gText_60Pts
|
||||
.4byte gText_70Pts
|
||||
.4byte gText_80Pts
|
||||
.4byte gText_90Pts
|
||||
.4byte gText_100Pts
|
||||
.4byte gText_QuestionMark
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
|
||||
.4byte gText_KissPoster16BP
|
||||
.4byte gText_KissCushion32BP
|
||||
.4byte gText_SmoochumDoll32BP
|
||||
.4byte gText_TogepiDoll48BP
|
||||
.4byte gText_MeowthDoll48BP
|
||||
.4byte gText_ClefairyDoll48BP
|
||||
.4byte gText_DittoDoll48BP
|
||||
.4byte gText_CyndaquilDoll80BP
|
||||
.4byte gText_ChikoritaDoll80BP
|
||||
.4byte gText_TotodileDoll80BP
|
||||
.4byte gText_Exit
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
|
||||
.4byte gText_LaprasDoll128BP
|
||||
.4byte gText_SnorlaxDoll128BP
|
||||
.4byte gText_VenusaurDoll256BP
|
||||
.4byte gText_CharizardDoll256BP
|
||||
.4byte gText_BlastoiseDoll256BP
|
||||
.4byte gText_Exit
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
|
||||
.4byte gText_Protein1BP
|
||||
.4byte gText_Calcium1BP
|
||||
.4byte gText_Iron1BP
|
||||
.4byte gText_Zinc1BP
|
||||
.4byte gText_Carbos1BP
|
||||
.4byte gText_HpUp1BP
|
||||
.4byte gText_Exit
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
|
||||
.4byte gText_Leftovers48BP
|
||||
.4byte gText_WhiteHerb48BP
|
||||
.4byte gText_QuickClaw48BP
|
||||
.4byte gText_MentalHerb48BP
|
||||
.4byte gText_BrightPowder64BP
|
||||
.4byte gText_ChoiceBand64BP
|
||||
.4byte gText_KingsRock64BP
|
||||
.4byte gText_FocusBand64BP
|
||||
.4byte gText_ScopeLens64BP
|
||||
.4byte gText_Exit
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
|
||||
.4byte gText_EnergyPowder50
|
||||
.4byte gText_EnergyRoot80
|
||||
.4byte gText_HealPowder50
|
||||
.4byte gText_RevivalHerb300
|
||||
.4byte gText_Protein1000
|
||||
.4byte gText_Iron1000
|
||||
.4byte gText_Carbos1000
|
||||
.4byte gText_Calcium1000
|
||||
.4byte gText_Zinc1000
|
||||
.4byte gText_HPUp1000
|
||||
.4byte gText_PPUp3000
|
||||
.4byte gText_Exit
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
|
||||
.4byte gText_BattleTower2
|
||||
.4byte gText_BattleDome
|
||||
.4byte gText_BattlePalace
|
||||
.4byte gText_BattleArena
|
||||
.4byte gText_BattleFactory
|
||||
.4byte gText_BattlePike
|
||||
.4byte gText_BattlePyramid
|
||||
.4byte gText_RankingHall
|
||||
.4byte gText_ExchangeService
|
||||
.4byte gText_Exit
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
|
||||
.4byte gText_Softboiled16BP
|
||||
.4byte gText_SeismicToss24BP
|
||||
.4byte gText_DreamEater24BP
|
||||
.4byte gText_MegaPunch24BP
|
||||
.4byte gText_MegaKick48BP
|
||||
.4byte gText_BodySlam48BP
|
||||
.4byte gText_RockSlide48BP
|
||||
.4byte gText_Counter48BP
|
||||
.4byte gText_ThunderWave48BP
|
||||
.4byte gText_SwordsDance48BP
|
||||
.4byte gText_Exit
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
|
||||
.4byte gText_DefenseCurl16BP
|
||||
.4byte gText_Snore24BP
|
||||
.4byte gText_MudSlap24BP
|
||||
.4byte gText_Swift24BP
|
||||
.4byte gText_IcyWind24BP
|
||||
.4byte gText_Endure48BP
|
||||
.4byte gText_PsychUp48BP
|
||||
.4byte gText_IcePunch48BP
|
||||
.4byte gText_ThunderPunch48BP
|
||||
.4byte gText_FirePunch48BP
|
||||
.4byte gText_Exit
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
|
||||
.4byte gText_SlateportCity
|
||||
.4byte gText_BattleFrontier
|
||||
.4byte gText_SouthernIsland
|
||||
.4byte gText_NavelRock
|
||||
.4byte gText_BirthIsland
|
||||
.4byte gText_FarawayIsland
|
||||
.4byte gText_Exit
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
|
||||
.4byte gText_BattleTrainers
|
||||
.4byte gText_BattleBasics
|
||||
.4byte gText_PokemonNature
|
||||
.4byte gText_PokemonMoves
|
||||
.4byte gText_Underpowered
|
||||
.4byte gText_WhenInDanger
|
||||
.4byte gText_Exit
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
.4byte NULL
|
||||
|
||||
.align 2
|
||||
gUnknown_085B3030:: @ 85B3030
|
||||
.4byte 0x03000002, 0x00000000, 0x07d00000, 0x00000064
|
||||
|
||||
@ -14,7 +14,7 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0
|
||||
waitmovement 0
|
||||
special sub_813A080
|
||||
waitse
|
||||
special sub_8139A78
|
||||
special ShakeScreenInElevator
|
||||
waitstate
|
||||
delay 48
|
||||
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E
|
||||
|
||||
@ -118,7 +118,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
|
||||
applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_2725AA
|
||||
waitmovement 0
|
||||
waitse
|
||||
special sub_8139A78
|
||||
special ShakeScreenInElevator
|
||||
waitstate
|
||||
setflag FLAG_0x002
|
||||
return
|
||||
|
||||
@ -50,7 +50,7 @@ TrainerHill_Elevator_EventScript_2693D4:: @ 82693D4
|
||||
|
||||
TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9
|
||||
waitse
|
||||
special sub_8139A78
|
||||
special ShakeScreenInElevator
|
||||
waitstate
|
||||
return
|
||||
|
||||
|
||||
@ -284,7 +284,7 @@ gSpecials:: @ 81DBA64
|
||||
def_special sub_80FB7A4
|
||||
def_special DoSoftReset
|
||||
def_special GameClear
|
||||
def_special sub_8139A78
|
||||
def_special ShakeScreenInElevator
|
||||
def_special nullsub_55
|
||||
def_special SpawnScriptEventObject
|
||||
def_special RemoveScriptEventObject
|
||||
|
||||
@ -344,7 +344,8 @@ struct BattleFrontier
|
||||
/*0xCA9*/ u8 field_CA9_f:1; // 0x80
|
||||
/*0xCAA*/ u16 field_CAA[4];
|
||||
/*0xCB2*/ u16 field_CB2;
|
||||
/*0xCB4*/ u16 field_CB4[30];
|
||||
/*0xCB4*/ u16 field_CB4[22];
|
||||
/*0xCE0*/ u16 field_CE0[4][2];
|
||||
/*0xCF0*/ u16 field_CF0[2];
|
||||
/*0xCF4*/ u16 field_CF4[2];
|
||||
/*0xCF8*/ u16 field_CF8[2];
|
||||
@ -355,24 +356,21 @@ struct BattleFrontier
|
||||
/*0xD09*/ u8 filler_D09;
|
||||
/*0xD0A*/ u8 filler_D0A;
|
||||
/*0xD0B*/ u8 filler_D0B;
|
||||
/*0xD0C*/ u8 filler_D0C;
|
||||
/*0xD0D*/ u8 filler_D0D;
|
||||
/*0xD0E*/ u8 filler_D0E;
|
||||
/*0xD0F*/ u8 filler_D0F;
|
||||
/*0xD0C*/ u16 field_D0C[2];
|
||||
/*0xD10*/ u8 filler_D10;
|
||||
/*0xD11*/ u8 filler_D11;
|
||||
/*0xD12*/ u8 filler_D12;
|
||||
/*0xD13*/ u8 filler_D13;
|
||||
/*0xD14*/ u16 field_D14[2];
|
||||
/*0xD18*/ u8 field_D18[0xB8];
|
||||
/*0xD18*/ u8 field_D18[0xB0];
|
||||
/*0xDC8*/ u16 field_DC8[2];
|
||||
/*0xDCC*/ u8 filler_DCC[4];
|
||||
/*0xDD0*/ u16 field_DD0[2];
|
||||
/*0xDD4*/ u16 field_DD4[2];
|
||||
/*0xDD8*/ u16 field_DD8;
|
||||
/*0xDDA*/ u16 field_DDA;
|
||||
/*0xDDC*/ u16 field_DDC;
|
||||
/*0xDDA*/ u16 field_DDA[2];
|
||||
/*0xDDE*/ u16 field_DDE[2];
|
||||
/*0xDE2*/ u16 field_DE2;
|
||||
/*0xDE4*/ u16 field_DE4;
|
||||
/*0xDE2*/ u16 field_DE2[2];
|
||||
/*0xDE6*/ u16 field_DE6;
|
||||
/*0xDE8*/ u16 field_DE8;
|
||||
/*0xDEA*/ u16 field_DEA[2];
|
||||
@ -387,11 +385,9 @@ struct BattleFrontier
|
||||
/*0xDFE*/ u16 field_DFE;
|
||||
/*0xE00*/ u16 field_E00;
|
||||
/*0xE02*/ u16 field_E02;
|
||||
/*0xE04*/ u16 field_E04;
|
||||
/*0xE06*/ u16 field_E06;
|
||||
/*0xE04*/ u16 field_E04[2];
|
||||
/*0xE08*/ u16 field_E08[9];
|
||||
/*0xE1A*/ u16 field_E1A;
|
||||
/*0xE1C*/ u16 field_E1C;
|
||||
/*0xE1A*/ u16 field_E1A[2];
|
||||
/*0xE1E*/ u16 field_E1E[7];
|
||||
/*0xE2C*/ struct PyramidBag pyramidBag;
|
||||
/*0xE58*/ u16 field_E58;
|
||||
|
||||
@ -51,7 +51,7 @@ void blit_move_info_icon(u8 winId, u8 a2, u16 x, u16 y);
|
||||
void reset_temp_tile_data_buffers(void);
|
||||
void *decompress_and_copy_tile_data_to_vram(u8 bgId, const void *src, int size, u16 offset, u8 mode);
|
||||
bool8 free_temp_tile_data_buffers_if_possible(void);
|
||||
struct WindowTemplate sub_8198A50(u8, u8, u8, u8, u8, u8, u16);
|
||||
struct WindowTemplate CreateWindowTemplate(u8, u8, u8, u8, u8, u8, u16);
|
||||
void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos);
|
||||
void copy_decompressed_tile_data_to_vram_autofree(u8 bgId, const void *src, int size, u16 offset, u8 mode);
|
||||
s8 ProcessMenuInputNoWrap_(void);
|
||||
|
||||
@ -9,8 +9,9 @@ bool8 ScriptMenu_YesNo(u8 var1, u8 var2);
|
||||
bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
|
||||
bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3);
|
||||
bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
|
||||
u8 convert_pixel_width_to_tile_width(s32);
|
||||
s32 convert_pixel_width_to_tile_width(s32);
|
||||
u8 CreateWindowFromRect(u8, u8, u8, u8);
|
||||
void sub_80E2A78(u8);
|
||||
u32 display_text_and_get_width(const u8*, u32);
|
||||
|
||||
#endif //GUARD_SCRIPT_MENU_H
|
||||
|
||||
@ -472,4 +472,179 @@ extern const u8 gText_BigGirl[];
|
||||
extern const u8 gText_Son[];
|
||||
extern const u8 gText_Daughter[];
|
||||
|
||||
extern const u8 gText_1F[];
|
||||
extern const u8 gText_2F[];
|
||||
extern const u8 gText_3F[];
|
||||
extern const u8 gText_4F[];
|
||||
extern const u8 gText_5F[];
|
||||
extern const u8 gText_6F[];
|
||||
extern const u8 gText_7F[];
|
||||
extern const u8 gText_8F[];
|
||||
extern const u8 gText_9F[];
|
||||
extern const u8 gText_10F[];
|
||||
extern const u8 gText_11F[];
|
||||
extern const u8 gText_B1F[];
|
||||
extern const u8 gText_B2F[];
|
||||
extern const u8 gText_B3F[];
|
||||
extern const u8 gText_B4F[];
|
||||
extern const u8 gText_Rooftop[];
|
||||
extern const u8 gText_ElevatorNowOn[];
|
||||
|
||||
extern const u8 BattleFrontier_Lounge2_Text_260971[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_260A1E[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_260AE7[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_2619AC[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_261A91[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_261B0C[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_261B95[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_261B95[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_261B95[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_261C1A[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_260BC4[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_260C6D[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_260D3A[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_260E1E[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_260EC7[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_260F74[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_2614E6[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_261591[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_26166F[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_261282[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_261329[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_261403[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_261026[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_2610CC[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_261194[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_26174D[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_2617F9[];
|
||||
extern const u8 BattleFrontier_Lounge2_Text_2618C4[];
|
||||
|
||||
extern const u8 gText_Exit[];
|
||||
|
||||
extern const u8 gText_BlueFlute[];
|
||||
extern const u8 gText_YellowFlute[];
|
||||
extern const u8 gText_RedFlute[];
|
||||
extern const u8 gText_WhiteFlute[];
|
||||
extern const u8 gText_BlackFlute[];
|
||||
extern const u8 gText_PrettyChair[];
|
||||
extern const u8 gText_PrettyDesk[];
|
||||
extern const u8 gText_Exit[];
|
||||
|
||||
extern const u8 gText_0Pts[];
|
||||
extern const u8 gText_10Pts[];
|
||||
extern const u8 gText_20Pts[];
|
||||
extern const u8 gText_30Pts[];
|
||||
extern const u8 gText_40Pts[];
|
||||
extern const u8 gText_50Pts[];
|
||||
extern const u8 gText_60Pts[];
|
||||
extern const u8 gText_70Pts[];
|
||||
extern const u8 gText_80Pts[];
|
||||
extern const u8 gText_90Pts[];
|
||||
extern const u8 gText_100Pts[];
|
||||
extern const u8 gText_QuestionMark[];
|
||||
|
||||
extern const u8 gText_KissPoster16BP[];
|
||||
extern const u8 gText_KissCushion32BP[];
|
||||
extern const u8 gText_SmoochumDoll32BP[];
|
||||
extern const u8 gText_TogepiDoll48BP[];
|
||||
extern const u8 gText_MeowthDoll48BP[];
|
||||
extern const u8 gText_ClefairyDoll48BP[];
|
||||
extern const u8 gText_DittoDoll48BP[];
|
||||
extern const u8 gText_CyndaquilDoll80BP[];
|
||||
extern const u8 gText_ChikoritaDoll80BP[];
|
||||
extern const u8 gText_TotodileDoll80BP[];
|
||||
extern const u8 gText_Exit[];
|
||||
|
||||
extern const u8 gText_LaprasDoll128BP[];
|
||||
extern const u8 gText_SnorlaxDoll128BP[];
|
||||
extern const u8 gText_VenusaurDoll256BP[];
|
||||
extern const u8 gText_CharizardDoll256BP[];
|
||||
extern const u8 gText_BlastoiseDoll256BP[];
|
||||
extern const u8 gText_Exit[];
|
||||
|
||||
extern const u8 gText_Protein1BP[];
|
||||
extern const u8 gText_Calcium1BP[];
|
||||
extern const u8 gText_Iron1BP[];
|
||||
extern const u8 gText_Zinc1BP[];
|
||||
extern const u8 gText_Carbos1BP[];
|
||||
extern const u8 gText_HpUp1BP[];
|
||||
extern const u8 gText_Exit[];
|
||||
|
||||
extern const u8 gText_Leftovers48BP[];
|
||||
extern const u8 gText_WhiteHerb48BP[];
|
||||
extern const u8 gText_QuickClaw48BP[];
|
||||
extern const u8 gText_MentalHerb48BP[];
|
||||
extern const u8 gText_BrightPowder64BP[];
|
||||
extern const u8 gText_ChoiceBand64BP[];
|
||||
extern const u8 gText_KingsRock64BP[];
|
||||
extern const u8 gText_FocusBand64BP[];
|
||||
extern const u8 gText_ScopeLens64BP[];
|
||||
extern const u8 gText_Exit[];
|
||||
|
||||
extern const u8 gText_EnergyPowder50[];
|
||||
extern const u8 gText_EnergyRoot80[];
|
||||
extern const u8 gText_HealPowder50[];
|
||||
extern const u8 gText_RevivalHerb300[];
|
||||
extern const u8 gText_Protein1000[];
|
||||
extern const u8 gText_Iron1000[];
|
||||
extern const u8 gText_Carbos1000[];
|
||||
extern const u8 gText_Calcium1000[];
|
||||
extern const u8 gText_Zinc1000[];
|
||||
extern const u8 gText_HPUp1000[];
|
||||
extern const u8 gText_PPUp3000[];
|
||||
extern const u8 gText_Exit[];
|
||||
|
||||
extern const u8 gText_BattleTower2[];
|
||||
extern const u8 gText_BattleDome[];
|
||||
extern const u8 gText_BattlePalace[];
|
||||
extern const u8 gText_BattleArena[];
|
||||
extern const u8 gText_BattleFactory[];
|
||||
extern const u8 gText_BattlePike[];
|
||||
extern const u8 gText_BattlePyramid[];
|
||||
extern const u8 gText_RankingHall[];
|
||||
extern const u8 gText_ExchangeService[];
|
||||
extern const u8 gText_Exit[];
|
||||
|
||||
extern const u8 gText_Softboiled16BP[];
|
||||
extern const u8 gText_SeismicToss24BP[];
|
||||
extern const u8 gText_DreamEater24BP[];
|
||||
extern const u8 gText_MegaPunch24BP[];
|
||||
extern const u8 gText_MegaKick48BP[];
|
||||
extern const u8 gText_BodySlam48BP[];
|
||||
extern const u8 gText_RockSlide48BP[];
|
||||
extern const u8 gText_Counter48BP[];
|
||||
extern const u8 gText_ThunderWave48BP[];
|
||||
extern const u8 gText_SwordsDance48BP[];
|
||||
extern const u8 gText_Exit[];
|
||||
|
||||
extern const u8 gText_DefenseCurl16BP[];
|
||||
extern const u8 gText_Snore24BP[];
|
||||
extern const u8 gText_MudSlap24BP[];
|
||||
extern const u8 gText_Swift24BP[];
|
||||
extern const u8 gText_IcyWind24BP[];
|
||||
extern const u8 gText_Endure48BP[];
|
||||
extern const u8 gText_PsychUp48BP[];
|
||||
extern const u8 gText_IcePunch48BP[];
|
||||
extern const u8 gText_ThunderPunch48BP[];
|
||||
extern const u8 gText_FirePunch48BP[];
|
||||
extern const u8 gText_Exit[];
|
||||
|
||||
extern const u8 gText_SlateportCity[];
|
||||
extern const u8 gText_BattleFrontier[];
|
||||
extern const u8 gText_SouthernIsland[];
|
||||
extern const u8 gText_NavelRock[];
|
||||
extern const u8 gText_BirthIsland[];
|
||||
extern const u8 gText_FarawayIsland[];
|
||||
extern const u8 gText_Exit[];
|
||||
|
||||
extern const u8 gText_BattleTrainers[];
|
||||
extern const u8 gText_BattleBasics[];
|
||||
extern const u8 gText_PokemonNature[];
|
||||
extern const u8 gText_PokemonMoves[];
|
||||
extern const u8 gText_Underpowered[];
|
||||
extern const u8 gText_WhenInDanger[];
|
||||
extern const u8 gText_Exit[];
|
||||
|
||||
#endif //GUARD_STRINGS_H
|
||||
|
||||
1061
src/field_specials.c
1061
src/field_specials.c
File diff suppressed because it is too large
Load Diff
@ -1965,7 +1965,7 @@ void sub_80323CC(u8 a, u8 b, u16 c, u16 d, u8 e, u8 f)
|
||||
{
|
||||
struct WindowTemplate sp;
|
||||
|
||||
sp = sub_8198A50(0, a + 1, b + 1, 5, 4, f, d);
|
||||
sp = CreateWindowTemplate(0, a + 1, b + 1, 5, 4, f, d);
|
||||
CreateYesNoMenu(&sp, c, e, 0);
|
||||
}
|
||||
|
||||
|
||||
@ -1143,7 +1143,7 @@ void SetWindowTemplateFields(struct WindowTemplate *template, u8 bg, u8 left, u8
|
||||
template->baseBlock = baseBlock;
|
||||
}
|
||||
|
||||
struct WindowTemplate sub_8198A50(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock)
|
||||
struct WindowTemplate CreateWindowTemplate(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock)
|
||||
{
|
||||
struct WindowTemplate template;
|
||||
SetWindowTemplateFields(&template, bg, left, top, width, height, paletteNum, baseBlock);
|
||||
|
||||
@ -1515,7 +1515,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx)
|
||||
xText = (xWindow - xText - 1) * 8 + 3;
|
||||
yText = (yText - yWindow - 1) * 8;
|
||||
|
||||
winTemplate = sub_8198A50(0, xWindow, yWindow + 1, width, height, 0xF, 0x1);
|
||||
winTemplate = CreateWindowTemplate(0, xWindow, yWindow + 1, width, height, 0xF, 0x1);
|
||||
gUnknown_03000F30 = AddWindow(&winTemplate);
|
||||
LoadUserWindowBorderGfx(gUnknown_03000F30, 0x214, 0xE0);
|
||||
NewMenuHelpers_DrawStdWindowFrame(gUnknown_03000F30, 0);
|
||||
|
||||
@ -91,8 +91,7 @@ gUnknown_030061C0: @ 30061C0
|
||||
gUnknown_030061C4: @ 30061C4
|
||||
.space 0xC
|
||||
|
||||
gUnknown_030061D0: @ 30061D0
|
||||
.space 0x18
|
||||
.include "field_specials.o"
|
||||
|
||||
gCB2_AfterEvolution: @ 30061E8
|
||||
.space 0x4
|
||||
|
||||
@ -605,36 +605,6 @@ gPlayerFacingPosition: @ 203AB40
|
||||
.include "src/pokeblock.o"
|
||||
.include "src/field_specials.o"
|
||||
|
||||
gUnknown_0203AB5E: @ 203AB5E
|
||||
.space 0x2
|
||||
|
||||
gUnknown_0203AB60: @ 203AB60
|
||||
.space 0x2
|
||||
|
||||
gUnknown_0203AB62: @ 203AB62
|
||||
.space 0x2
|
||||
|
||||
gUnknown_0203AB64: @ 203AB64
|
||||
.space 0x4
|
||||
|
||||
gUnknown_0203AB68: @ 203AB68
|
||||
.space 0x2
|
||||
|
||||
gUnknown_0203AB6A: @ 203AB6A
|
||||
.space 0x2
|
||||
|
||||
gUnknown_0203AB6C: @ 203AB6C
|
||||
.space 0x1
|
||||
|
||||
gUnknown_0203AB6D: @ 203AB6D
|
||||
.space 0x1
|
||||
|
||||
gUnknown_0203AB6E: @ 203AB6E
|
||||
.space 0x1
|
||||
|
||||
gUnknown_0203AB6F: @ 203AB6F
|
||||
.space 0x1
|
||||
|
||||
gUnknown_0203AB70: @ 203AB70
|
||||
.space 0x4
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user