pret/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-10-06 09:05:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #594 from PikalaxALT/taya

Browse Source 
Taya debug window
This commit is contained in:
Marcus Huderle
2018-04-11 17:36:58 -07:00
committed by GitHub
parent ba6f60e467 78bd32c68b
commit fcb919c7cf
8 changed files with 1090 additions and 2277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/taya_debug_window.s
-2054
View File
File diff suppressed because it is too large Load Diff
data/debug_menu_taya.s
-219
View File
@@ -1,219 +0,0 @@
.include "include/macros.inc"
.include "constants/constants.inc"
.section .rodata
.if DEBUG
gUnknown_Debug_083C4E54:: @ 0x83C4E54
.string "Profile$"
gUnknown_Debug_083C4E5C:: @ 0x83C4E5C
.string "Battle’s　start$"
gUnknown_Debug_083C4E6B:: @ 0x83C4E6B
.string "Good　saying$"
gUnknown_Debug_083C4E77:: @ 0x83C4E77
.string "Lose　a　battle$"
gUnknown_Debug_083C4E85:: @ 0x83C4E85
.string "MAIL$"
gUnknown_Debug_083C4E8A:: @ 0x83C4E8A
.string "MAIL　salutation$"
gUnknown_Debug_083C4E9A:: @ 0x83C4E9A
.string "BARD’s　song$"
gUnknown_Debug_083C4EA6:: @ 0x83C4EA6
.string "Interview$"
gUnknown_Debug_083C4EB0:: @ 0x83C4EB0
.string "InterviewシBTス$"
.align 2
gUnknown_Debug_083C4EC0:: @ 0x83C4EC0
.4byte gUnknown_Debug_083C4E54, 0x0
.4byte gUnknown_Debug_083C4E5C, 0x1
.4byte gUnknown_Debug_083C4E6B, 0xD
.4byte gUnknown_Debug_083C4E77, 0x3
.4byte gUnknown_Debug_083C4E85, 0x4
.4byte gUnknown_Debug_083C4E8A, 0x5
.4byte gUnknown_Debug_083C4E9A, 0x6
.4byte gUnknown_Debug_083C4EA6, 0x7
.4byte gUnknown_Debug_083C4EB0, 0xC
gUnknown_Debug_083C4F08:: @ 0x83C4F08
.string "サえぃえそい"
gUnknown_Debug_083C4F0E:: @ 0x83C4F0E
.string "BARD$"
gUnknown_Debug_083C4F13:: @ 0x83C4F13
.string "HIPSTER$"
gUnknown_Debug_083C4F1B:: @ 0x83C4F1B
.string "RECYCLE$"
gUnknown_Debug_083C4F23:: @ 0x83C4F23
.string "STORYTELLER$"
gUnknown_Debug_083C4F2F:: @ 0x83C4F2F
.string "GIDDY　GUY$"
gUnknown_Debug_083C4F39:: @ 0x83C4F39
.string "Flag　OFF$"
gUnknown_Debug_083C4F42:: @ 0x83C4F42
.string "21　letters$"
gUnknown_Debug_083C4F4D:: @ 0x83C4F4D
.string "ナウくなる$"
.align 2
gUnknown_Debug_083C4F54:: @ 0x83C4F54
.4byte gUnknown_Debug_083C4F0E, 0x0
.4byte gUnknown_Debug_083C4F13, 0x0
.4byte gUnknown_Debug_083C4F1B, 0x0
.4byte gUnknown_Debug_083C4F23, 0x0
.4byte gUnknown_Debug_083C4F2F, 0x0
.4byte gUnknown_Debug_083C4F39, 0x0
.4byte gUnknown_Debug_083C4F42, 0x0
.4byte gUnknown_Debug_083C4F4D, 0x0
gUnknown_Debug_083C4F94:: @ 0x83C4F94
.string "しょうしょうおまちください！$"
gUnknown_Debug_083C4FA3:: @ 0x83C4FA3
.string "Weather$"
gUnknown_Debug_083C4FAB:: @ 0x83C4FAB
.string "LANETTE’S　PC$"
gUnknown_Debug_083C4FB8:: @ 0x83C4FB8
.string "SimpleText$"
gUnknown_Debug_083C4FC3:: @ 0x83C4FC3
.string "Old　man$"
gUnknown_Debug_083C4FCB:: @ 0x83C4FCB
.string "Trend$"
gUnknown_Debug_083C4FD1:: @ 0x83C4FD1
.string "Trend　R$"
gUnknown_Debug_083C4FD9:: @ 0x83C4FD9
.string "Town　flag$"
gUnknown_Debug_083C4FE3:: @ 0x83C4FE3
.string "Award　a　ribbon$"
gUnknown_Debug_083C4FF2:: @ 0x83C4FF2
.string "{PKMN}LOTTERY$"
gUnknown_Debug_083C4FFC:: @ 0x83C4FFC
.string "Trainer$"
gUnknown_Debug_083C5004:: @ 0x83C5004
.string "POKéNAV　D$"
.align 2
gUnknown_Debug_083C5010:: @ 0x83C5010
.4byte gUnknown_Debug_083C4FA3, debug_sub_808560C+1
.4byte gUnknown_Debug_083C4FAB, TayaDebugMenu_LanettesPC+1
.4byte gUnknown_Debug_083C4FB8, TayaDebugMenu_SimpleText+1
.4byte gUnknown_Debug_083C4FC3, TayaDebugMenu_OldMan+1
.4byte gUnknown_Debug_083C4FCB, TayaDebugMenu_Trend+1
.4byte gUnknown_Debug_083C4FD1, TayaDebugMenu_TrendR+1
.4byte gUnknown_Debug_083C4FD9, TayaDebugMenu_TownFlags+1
.4byte gUnknown_Debug_083C4FE3, TayaDebugMenu_AwardARibbon+1
.4byte gUnknown_Debug_083C4FF2, TayaDebugMenu_PKMNLottery+1
gUnknown_Debug_083C5058:: @ 0x83C5058
.4byte gUnknown_Debug_083C4FFC, TayaDebugMenu_Trainer+1
.4byte gUnknown_Debug_083C5004, TayaDebugMenu_PokenavD+1
gUnknown_Debug_83C5068::
.4byte gUnknown_Debug_083C5010, 0x9
.4byte gUnknown_Debug_083C5058, 0x2
gUnknown_Debug_083C5078:: @ 0x83C5078
.string "CHANP$"
gUnknown_Debug_083C507E:: @ 0x83C507E
.string "COOL$"
gUnknown_Debug_083C5083:: @ 0x83C5083
.string "BEAUTY$"
gUnknown_Debug_083C508A:: @ 0x83C508A
.string "CUTE$"
gUnknown_Debug_083C508F:: @ 0x83C508F
.string "SMART$"
gUnknown_Debug_083C5095:: @ 0x83C5095
.string "TOUGH$"
gUnknown_Debug_083C509B:: @ 0x83C509B
.string "WIN$"
gUnknown_Debug_083C509F:: @ 0x83C509F
.string "VICTORY$"
gUnknown_Debug_083C50A7:: @ 0x83C50A7
.string "BROMIDE$"
gUnknown_Debug_083C50AF:: @ 0x83C50AF
.string "ACCESSIT$"
gUnknown_Debug_083C50B8:: @ 0x83C50B8
.string "MARINE$"
gUnknown_Debug_083C50BF:: @ 0x83C50BF
.string "LAND$"
gUnknown_Debug_083C50C4:: @ 0x83C50C4
.string "SKY$"
gUnknown_Debug_083C50C8:: @ 0x83C50C8
.string "COUNTRY$"
gUnknown_Debug_083C50D0:: @ 0x83C50D0
.string "NATIONAL$"
gUnknown_Debug_083C50D9:: @ 0x83C50D9
.string "EARTH$"
gUnknown_Debug_083C50DF:: @ 0x83C50DF
.string "WORLD$"
gUnknown_Debug_083C50E5:: @ 0x83C50E5
.string "　　　　　$"
.align 2
gUnknown_Debug_083C50EC:: @ 0x83C50EC
.4byte gUnknown_Debug_083C5078, 0x43
.4byte gUnknown_Debug_083C507E, 0x32
.4byte gUnknown_Debug_083C5083, 0x33
.4byte gUnknown_Debug_083C508A, 0x34
.4byte gUnknown_Debug_083C508F, 0x35
.4byte gUnknown_Debug_083C5095, 0x36
.4byte gUnknown_Debug_083C509B, 0x44
.4byte gUnknown_Debug_083C509F, 0x45
.4byte gUnknown_Debug_083C50A7, 0x46
.4byte gUnknown_Debug_083C50AF, 0x47
.4byte gUnknown_Debug_083C50B8, 0x48
.4byte gUnknown_Debug_083C50BF, 0x49
.4byte gUnknown_Debug_083C50C4, 0x4A
.4byte gUnknown_Debug_083C50C8, 0x4B
.4byte gUnknown_Debug_083C50D0, 0x4C
.4byte gUnknown_Debug_083C50D9, 0x4D
.4byte gUnknown_Debug_083C50DF, 0x4E
.4byte gUnknown_Debug_083C50E5, 0x0
gUnknown_Debug_083C517C:: @ 0x83C517C
.string "Select　Ribbon$"
.endif
include/battle_setup.h
+2
View File
@@ -47,6 +47,8 @@ struct TrainerEyeTrainer
u16 mapNum;
};
extern const struct TrainerEyeTrainer gTrainerEyeTrainers[56];
void BattleSetup_StartWildBattle(void);
void BattleSetup_StartRoamerBattle(void);
void BattleSetup_StartScriptedWildBattle(void);
include/mauville_man.h
+2
View File
@@ -6,5 +6,7 @@
void SetupMauvilleOldMan(void);
void sub_80F7F30(void);
void sub_80F83D0(void);
void debug_sub_810B32C(u8);
u8 GetCurrentMauvilleOldMan(void);
#endif // GUARD_MAUVILLE_OLD_MAN_H
include/pokemon_storage_system.h
+1
View File
@@ -298,5 +298,6 @@ void sub_809CFF0(void);
void sub_809D034(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u16 sTop, u16 width, u16 height);
void sub_809D104(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u16 sTop, u16 width, u16 height);
void sub_809D16C(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height);
void ShowPokemonStorageSystem(void);
#endif // GUARD_POKEMON_STORAGE_SYSTEM_H
include/region_map.h
+1
View File
@@ -69,5 +69,6 @@ const u8 *GetMapSectionName(u8 *dest, u16 mapSectionId, u16 length);
const u8 *CopyMapName(u8 *dest, u16 b);
const u8 *CopyLocationName(u8 *dest, u16 b);
void CB2_InitFlyRegionMap(void);
void debug_sub_8110F28(void);
#endif // GUARD_REGION_MAP_H
ld_script.txt
+1 -2
View File
@@ -117,7 +117,6 @@ SECTIONS {
src/debug/tomomichi_debug_menu.o(.text);
src/debug/nohara_debug_menu.o(.text);
src/debug/mori_debug_menu.o(.text);
asm/taya_debug_window.o(.text);
src/debug/taya_debug_window.o(.text);
src/trainer_see.o(.text);
src/wild_encounter.o(.text);
@@ -561,7 +560,7 @@ SECTIONS {
src/debug/tomomichi_debug_menu.o(.rodata);
src/debug/nohara_debug_menu.o(.rodata);
src/debug/mori_debug_menu.o(.rodata);
data/debug_menu_taya.o(.rodata);
src/debug/taya_debug_window.o(.rodata);
src/trainer_see.o(.rodata);
src/wild_encounter.o(.rodata);
src/field_effect.o(.rodata);
src/debug/taya_debug_window.c
+1083 -2
View File
File diff suppressed because it is too large Load Diff