summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--constants/sgb_constants.asm6
-rw-r--r--constants/start_menu_constants.asm4
-rwxr-xr-xengine/dumps/bank02.asm8
-rw-r--r--engine/menu/debug_menu.asm4
-rw-r--r--engine/menu/start_menu.asm8
-rw-r--r--gfx.asm18
-rw-r--r--gfx/trainer_gear/dexmap_nest_icon.1bpp.png (renamed from gfx/pokegear/dexmap_nest_icon.1bpp.png)bin86 -> 86 bytes
-rw-r--r--[-rwxr-xr-x]gfx/trainer_gear/radio.png (renamed from gfx/pokegear/pokegear_2.png)bin336 -> 336 bytes
-rw-r--r--gfx/trainer_gear/town_map.png (renamed from gfx/pokegear/town_map.png)bin339 -> 339 bytes
-rw-r--r--gfx/trainer_gear/town_map_cursor.png (renamed from gfx/pokegear/town_map_cursor.png)bin93 -> 93 bytes
-rw-r--r--[-rwxr-xr-x]gfx/trainer_gear/trainer_gear.png (renamed from gfx/pokegear/pokegear_1.png)bin6228 -> 6228 bytes
-rw-r--r--[-rwxr-xr-x]gfx/trainer_gear/vertical_pipe.png (renamed from gfx/pokegear/vertical_pipe.png)bin268 -> 268 bytes
-rw-r--r--layout.link2
-rwxr-xr-xshim.sym2
15 files changed, 27 insertions, 27 deletions
diff --git a/Makefile b/Makefile
index f3a0f4b..a3811b7 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ $(BUILD)/gfx/sgb/sgb_border_silver.2bpp: tools/gfx += --trim-whitespace
$(BUILD)/gfx/trainer_card/leaders.2bpp: tools/gfx += --trim-whitespace
-$(BUILD)/gfx/pokegear/town_map.2bpp: tools/gfx += --trim-trailing
+$(BUILD)/gfx/trainer_gear/town_map.2bpp: tools/gfx += --trim-trailing
$(BUILD)/gfx/minigames/slots.2bpp: tools/gfx += --trim-whitespace
$(BUILD)/gfx/minigames/poker.2bpp: tools/gfx += --trim-whitespace
diff --git a/constants/sgb_constants.asm b/constants/sgb_constants.asm
index 69fe02f..c3b53b5 100644
--- a/constants/sgb_constants.asm
+++ b/constants/sgb_constants.asm
@@ -2,7 +2,7 @@
const_def
const SGB_BATTLE_GRAYSCALE
const SGB_BATTLE_COLORS
- const SGB_POKEGEAR_PALS
+ const SGB_TRAINER_GEAR_PALS
const SGB_STATS_SCREEN_HP_PALS
const SGB_POKEDEX
const SGB_SLOT_MACHINE
@@ -88,7 +88,7 @@ SGB_RAM EQU -1
const PREDEFPAL_HP_GREEN
const PREDEFPAL_HP_YELLOW
const PREDEFPAL_HP_RED
- const PREDEFPAL_POKEGEAR
+ const PREDEFPAL_TRAINER_GEAR
const PREDEFPAL_BETA_LOGO_1
const PREDEFPAL_BETA_LOGO_2
const PREDEFPAL_GS_INTRO_GAMEFREAK_LOGO
@@ -108,7 +108,7 @@ SGB_RAM EQU -1
const PREDEFPAL_BETA_POKER_2
const PREDEFPAL_BETA_POKER_3
const PREDEFPAL_BETA_RADIO
- const PREDEFPAL_BETA_POKEGEAR
+ const PREDEFPAL_BETA_TRAINER_GEAR
const PREDEFPAL_47
const PREDEFPAL_GS_TITLE_SCREEN_0
const PREDEFPAL_GS_TITLE_SCREEN_1
diff --git a/constants/start_menu_constants.asm b/constants/start_menu_constants.asm
index 294ad78..3b8d12a 100644
--- a/constants/start_menu_constants.asm
+++ b/constants/start_menu_constants.asm
@@ -6,5 +6,5 @@
const START_SAVE ; 4
const START_OPTIONS ; 5
const START_EXIT ; 6
- const START_POKEGEAR ; 7
- const START_RESET ; 8 \ No newline at end of file
+ const START_TRAINER_GEAR ; 7
+ const START_RESET ; 8
diff --git a/engine/dumps/bank02.asm b/engine/dumps/bank02.asm
index 39eb195..500091e 100755
--- a/engine/dumps/bank02.asm
+++ b/engine/dumps/bank02.asm
@@ -1406,7 +1406,7 @@ Data8a53: ; 02:4a53
db $3c, $14, $3c, $20, $48, $14, $54, $1c
db $54, $2c, $54, $38, $3c, $44, $48, $2c
-OpenPokegear: ; 02:4aab
+OpenTrainerGear: ; 02:4aab
ld hl, wce5f
ld a, [hl]
push af
@@ -1443,7 +1443,7 @@ Function8ae0: ; 02:4ae0
call ClearSprites
ld b, $13
call GetSGBLayout
- ld hl, Pokegear1GFX
+ ld hl, TrainerGearGFX
ld de, vChars2
ld bc, $0200
ld a, $02
@@ -1672,9 +1672,9 @@ Function8cb7: ; 02:4cb7
call WaitForAutoBgMapTransfer
ld b, $15
call GetSGBLayout
- ld de, Pokegear2GFX
+ ld de, RadioGFX
ld hl, vTilesetEnd
- lb bc, BANK(Pokegear2GFX), $09
+ lb bc, BANK(RadioGFX), $09
call Request2bpp
ld de, VerticalPipeGFX
ld hl, vChars0
diff --git a/engine/menu/debug_menu.asm b/engine/menu/debug_menu.asm
index 17f24af..37c399e 100644
--- a/engine/menu/debug_menu.asm
+++ b/engine/menu/debug_menu.asm
@@ -101,9 +101,9 @@ Function40eb::
jp DebugMenu
DebugMenuOptionName:: ; 40EE
- callab OpenPokegear
+ callab OpenTrainerGear
ld a, $e4
ldh [rBGP], a
jp DebugMenu
-; 40FD \ No newline at end of file
+; 40FD
diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm
index 852d558..d1278fc 100644
--- a/engine/menu/start_menu.asm
+++ b/engine/menu/start_menu.asm
@@ -94,7 +94,7 @@ StartMenuJumpTable: ; 04:5E6C
dw StartMenu_Save
dw StartMenu_Settings
dw StartMenu_Exit
- dw StartMenu_Pokegear
+ dw StartMenu_TrainerGear
dw StartMenu_Reset
StartMenuItems: ; 04:5E7E
@@ -173,8 +173,8 @@ StartMenu_Exit: ; 04:5ECF
ld a, 1
ret
-StartMenu_Pokegear: ; 04:5ED2
- callab PokeGear
+StartMenu_TrainerGear: ; 04:5ED2
+ callab TrainerGear
ld a, 0
ret
@@ -2259,4 +2259,4 @@ PlaceTrainerCardBGTile: ; 04:7133
jr nz, .LastLoop
ret
-; end of section \ No newline at end of file
+; end of section
diff --git a/gfx.asm b/gfx.asm
index 443860e..abc629d 100644
--- a/gfx.asm
+++ b/gfx.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "gfx.asm@Mon Nest Icon", ROMX
PokedexNestIconGFX::
-INCBIN "gfx/pokegear/dexmap_nest_icon.1bpp"
+INCBIN "gfx/trainer_gear/dexmap_nest_icon.1bpp"
SECTION "gfx.asm@Bank 2 Misc GFX", ROMX
UnknownBouncingOrbGFX::
@@ -18,13 +18,13 @@ INCBIN "gfx/overworld/happy.2bpp"
UnknownBallGFX::
INCBIN "gfx/overworld/gfx_85cf.2bpp"
-SECTION "gfx.asm@Pokegear GFX", ROMX
-Pokegear1GFX::
-INCBIN "gfx/pokegear/pokegear_1.2bpp"
-Pokegear2GFX::
-INCBIN "gfx/pokegear/pokegear_2.2bpp"
+SECTION "gfx.asm@Trainer Gear GFX", ROMX
+TrainerGearGFX::
+INCBIN "gfx/trainer_gear/trainer_gear.2bpp"
+RadioGFX::
+INCBIN "gfx/trainer_gear/radio.2bpp"
VerticalPipeGFX::
-INCBIN "gfx/pokegear/vertical_pipe.2bpp"
+INCBIN "gfx/trainer_gear/vertical_pipe.2bpp"
SECTION "gfx.asm@Title Screen BG Decoration Border", ROMX
TitleBGDecorationBorder::
@@ -509,7 +509,7 @@ PokedexGFX:: INCBIN "gfx/pokedex/pokedex.2bpp"
PokedexGFXEnd::
PokedexLocationGFX:: INCBIN "gfx/pokedex/locations.2bpp" ; 0x0f8dc2--0x0f8e12
PokedexLocationGFXEnd::
-TownMapGFX:: INCBIN "gfx/pokegear/town_map.2bpp" ; 0x0f8e12--0x0f8fc2
+TownMapGFX:: INCBIN "gfx/trainer_gear/town_map.2bpp" ; 0x0f8e12--0x0f8fc2
TownMapGFXEnd::
HUD_GFX:: INCBIN "gfx/hud/hud.2bpp" ; 0x0f8fc2--0x0f9052
HUD_GFXEnd::
@@ -524,4 +524,4 @@ PackIconGFXEnd::
SECTION "gfx.asm@Town Map Cursor", ROMX
TownMapCursorGFX::
-INCBIN "gfx/pokegear/town_map_cursor.2bpp" \ No newline at end of file
+INCBIN "gfx/trainer_gear/town_map_cursor.2bpp"
diff --git a/gfx/pokegear/dexmap_nest_icon.1bpp.png b/gfx/trainer_gear/dexmap_nest_icon.1bpp.png
index 87c644d..87c644d 100644
--- a/gfx/pokegear/dexmap_nest_icon.1bpp.png
+++ b/gfx/trainer_gear/dexmap_nest_icon.1bpp.png
Binary files differ
diff --git a/gfx/pokegear/pokegear_2.png b/gfx/trainer_gear/radio.png
index 0e92fc8..0e92fc8 100755..100644
--- a/gfx/pokegear/pokegear_2.png
+++ b/gfx/trainer_gear/radio.png
Binary files differ
diff --git a/gfx/pokegear/town_map.png b/gfx/trainer_gear/town_map.png
index fb880cd..fb880cd 100644
--- a/gfx/pokegear/town_map.png
+++ b/gfx/trainer_gear/town_map.png
Binary files differ
diff --git a/gfx/pokegear/town_map_cursor.png b/gfx/trainer_gear/town_map_cursor.png
index 9eea705..9eea705 100644
--- a/gfx/pokegear/town_map_cursor.png
+++ b/gfx/trainer_gear/town_map_cursor.png
Binary files differ
diff --git a/gfx/pokegear/pokegear_1.png b/gfx/trainer_gear/trainer_gear.png
index c7d7ade..c7d7ade 100755..100644
--- a/gfx/pokegear/pokegear_1.png
+++ b/gfx/trainer_gear/trainer_gear.png
Binary files differ
diff --git a/gfx/pokegear/vertical_pipe.png b/gfx/trainer_gear/vertical_pipe.png
index cbaadc5..cbaadc5 100755..100644
--- a/gfx/pokegear/vertical_pipe.png
+++ b/gfx/trainer_gear/vertical_pipe.png
Binary files differ
diff --git a/layout.link b/layout.link
index 5515630..ea55c98 100644
--- a/layout.link
+++ b/layout.link
@@ -124,7 +124,7 @@ ROMX $02
"engine/dumps/bank02.asm@QueueFollowerFirstStep"
"gfx.asm@Mon Nest Icon"
"engine/dumps/bank02.asm@Data8a17"
- "gfx.asm@Pokegear GFX"
+ "gfx.asm@Trainer Gear GFX"
"engine/dumps/bank02.asm@Text91c2"
"gfx.asm@Title Screen BG Decoration Border"
"engine/dumps/bank02.asm@Function928b"
diff --git a/shim.sym b/shim.sym
index 6a6468e..457338f 100755
--- a/shim.sym
+++ b/shim.sym
@@ -171,7 +171,7 @@
3A:52C7 Music
3F:40E9 InGameDebugMenu
-3F:4305 PokeGear
+3F:4305 TrainerGear
3F:4C24 Functionfcc24
3F:4E3E Functionfce3e
3F:5B66 Functionfdb66
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 06:31:29 +0000