From 8cb28a31c7fb9f48fc496a8017fb7fa7c3d07e5a Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Sat, 8 Aug 2026 21:13:08 +0000 Subject: [PATCH] Add constants for `trainer` macro struct fields (#598) --------- Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com> --- pokeblue.map | 18 +++++++++--------- pokeblue_debug.map | 16 ++++++++-------- pokeblue_vc.map | 2 +- pokered.map | 18 +++++++++--------- pokered_vc.map | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pokeblue.map b/pokeblue.map index 76e697a63..05f4f4522 100644 --- a/pokeblue.map +++ b/pokeblue.map @@ -12279,18 +12279,18 @@ ROMX bank #26: SECTION: $406f-$7fee ($3f80 bytes) ["Tilesets 2"] $406f = Dojo_GFX $406f = Gym_GFX - $466f = Dojo_Block $466f = Gym_Block + $466f = Dojo_Block $4daf = Mart_GFX $4daf = Pokecenter_GFX - $53af = Mart_Block $53af = Pokecenter_Block - $55ff = ForestGate_GFX - $55ff = Museum_GFX + $53af = Mart_Block $55ff = Gate_GFX - $5bef = ForestGate_Block - $5bef = Museum_Block + $55ff = Museum_GFX + $55ff = ForestGate_GFX $5bef = Gate_Block + $5bef = Museum_Block + $5bef = ForestGate_Block $63ef = Forest_GFX $69ef = Forest_Block $71ef = Facility_GFX @@ -17675,15 +17675,15 @@ VRAM bank #0: $8000 = vChars0 $8000 = vSprites $8000 = vNPCSprites + $8800 = vTitleLogo $8800 = vChars1 $8800 = vFont $8800 = vNPCSprites2 - $8800 = vTitleLogo + $9000 = vTileset $9000 = vChars2 $9000 = vFrontPic - $9000 = vTileset - $9310 = vBackPic $9310 = vTitleLogo2 + $9310 = vBackPic $9800 = vBGMap0 $9c00 = vBGMap1 TOTAL EMPTY: $0000 bytes diff --git a/pokeblue_debug.map b/pokeblue_debug.map index a22a79884..eb9f6182b 100644 --- a/pokeblue_debug.map +++ b/pokeblue_debug.map @@ -12293,14 +12293,14 @@ ROMX bank #26: $466f = Gym_Block $4daf = Mart_GFX $4daf = Pokecenter_GFX - $53af = Mart_Block $53af = Pokecenter_Block + $53af = Mart_Block $55ff = Gate_GFX - $55ff = ForestGate_GFX $55ff = Museum_GFX - $5bef = ForestGate_Block - $5bef = Museum_Block + $55ff = ForestGate_GFX $5bef = Gate_Block + $5bef = Museum_Block + $5bef = ForestGate_Block $63ef = Forest_GFX $69ef = Forest_Block $71ef = Facility_GFX @@ -17685,15 +17685,15 @@ VRAM bank #0: $8000 = vChars0 $8000 = vSprites $8000 = vNPCSprites - $8800 = vChars1 - $8800 = vFont $8800 = vNPCSprites2 $8800 = vTitleLogo + $8800 = vChars1 + $8800 = vFont + $9000 = vTileset $9000 = vChars2 $9000 = vFrontPic - $9000 = vTileset - $9310 = vBackPic $9310 = vTitleLogo2 + $9310 = vBackPic $9800 = vBGMap0 $9c00 = vBGMap1 TOTAL EMPTY: $0000 bytes diff --git a/pokeblue_vc.map b/pokeblue_vc.map index cf332e1cb..27f0a07ce 100644 --- a/pokeblue_vc.map +++ b/pokeblue_vc.map @@ -12280,8 +12280,8 @@ ROMX bank #25: SECTION: $4000-$7fdf ($3fe0 bytes) ["Tilesets 1"] $4000 = Overworld_GFX $45e0 = Overworld_Block - $4de0 = RedsHouse1_GFX $4de0 = RedsHouse2_GFX + $4de0 = RedsHouse1_GFX $5270 = RedsHouse2_Block $5270 = RedsHouse1_Block $53a0 = House_GFX diff --git a/pokered.map b/pokered.map index ec007d004..3ecbbb8a3 100644 --- a/pokered.map +++ b/pokered.map @@ -12279,18 +12279,18 @@ ROMX bank #26: SECTION: $407f-$7ffe ($3f80 bytes) ["Tilesets 2"] $407f = Dojo_GFX $407f = Gym_GFX - $467f = Dojo_Block $467f = Gym_Block + $467f = Dojo_Block $4dbf = Mart_GFX $4dbf = Pokecenter_GFX - $53bf = Mart_Block $53bf = Pokecenter_Block - $560f = ForestGate_GFX - $560f = Museum_GFX + $53bf = Mart_Block $560f = Gate_GFX - $5bff = ForestGate_Block - $5bff = Museum_Block + $560f = Museum_GFX + $560f = ForestGate_GFX $5bff = Gate_Block + $5bff = Museum_Block + $5bff = ForestGate_Block $63ff = Forest_GFX $69ff = Forest_Block $71ff = Facility_GFX @@ -17675,15 +17675,15 @@ VRAM bank #0: $8000 = vChars0 $8000 = vSprites $8000 = vNPCSprites + $8800 = vTitleLogo $8800 = vChars1 $8800 = vFont $8800 = vNPCSprites2 - $8800 = vTitleLogo + $9000 = vTileset $9000 = vChars2 $9000 = vFrontPic - $9000 = vTileset - $9310 = vBackPic $9310 = vTitleLogo2 + $9310 = vBackPic $9800 = vBGMap0 $9c00 = vBGMap1 TOTAL EMPTY: $0000 bytes diff --git a/pokered_vc.map b/pokered_vc.map index f29d6d700..f9622240b 100644 --- a/pokered_vc.map +++ b/pokered_vc.map @@ -12282,8 +12282,8 @@ ROMX bank #25: SECTION: $4000-$7fdf ($3fe0 bytes) ["Tilesets 1"] $4000 = Overworld_GFX $45e0 = Overworld_Block - $4de0 = RedsHouse1_GFX $4de0 = RedsHouse2_GFX + $4de0 = RedsHouse1_GFX $5270 = RedsHouse2_Block $5270 = RedsHouse1_Block $53a0 = House_GFX